Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/springblade/payment/callback/trade/UserPayCallback.java

src/main/java/org/springblade/common/enums/OrderType.java

@@ -25,7 +25,7 @@ public enum OrderType {
 	 * */
 	MALL_SEND("mall_send"),
 	SHOP_SEND("shop_send"),
-	PAY_CONSUMER("mall_send");
+	PAY_CONSUMER("pay_consumer");
 
 	String name;
 

src/main/java/org/springblade/gateway/goods_gatway/service/impl/AppGoodsBillsServiceImpl.java

@@ -68,7 +68,6 @@ public class AppGoodsBillsServiceImpl extends BaseServiceImpl<GoodsBillsMapper,
 
 
 	@Override
-	@Transactional
 	public Map order(AppGoodsBillsDTO appGoodsBillsDTO) {
 		LoginUser loginUser = loginUserService.getById(appGoodsBillsDTO.getPayId());
 		Assert.notNull(loginUser,() -> {throw  new ServiceException(ResCode.USER_NOT_FOUNT);});

src/main/java/org/springblade/ldt/bills/controller/GoodsBillsController.java

@@ -16,25 +16,29 @@
  */
 package org.springblade.ldt.bills.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.ldt.bills.entity.GoodsBills;
+import org.springblade.ldt.bills.service.IGoodsBillsService;
 import org.springblade.ldt.bills.vo.GoodsBillsVO;
 import org.springblade.ldt.bills.wrapper.GoodsBillsWrapper;
-import org.springblade.ldt.bills.service.IGoodsBillsService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IShopService;
+import org.springblade.ldt.user.entity.LoginUser;
+import org.springblade.ldt.user.service.ILoginUserService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 订单 控制器
@@ -49,6 +53,8 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class GoodsBillsController extends BladeController {
 
 	private final IGoodsBillsService goodsBillsService;
+	private final ILoginUserService userService;
+	private final IShopService shopService;
 
 	/**
 	 * 详情
@@ -57,8 +63,26 @@ public class GoodsBillsController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入goodsBills")
 	public R<GoodsBillsVO> detail(GoodsBills goodsBills) {
-		GoodsBills detail = goodsBillsService.getOne(Condition.getQueryWrapper(goodsBills));
-		return R.data(GoodsBillsWrapper.build().entityVO(detail));
+		//GoodsBills detail = goodsBillsService.getOne(Condition.getQueryWrapper(goodsBills));
+		GoodsBillsVO detail = GoodsBillsWrapper.build().entityVO(goodsBillsService.getOne(Condition.getQueryWrapper(goodsBills)));
+		searchUserInfo(detail);
+		return R.data(detail);
+	}
+
+	/**
+	 * 接收人和付款人信息
+	 *
+	 * @param detail
+	 */
+	private void searchUserInfo(GoodsBillsVO detail) {
+		LoginUser user = userService.getById(detail.getPayId());
+		if (ObjectUtil.isNotEmpty(user)) {
+			detail.setPayer(user.getNickName());
+		}
+		Shop shop = shopService.getById(detail.getReceiveId());
+		if (ObjectUtil.isNotEmpty(shop)) {
+			detail.setTaker(shop.getName());
+		}
 	}
 
 	/**
@@ -68,8 +92,10 @@ public class GoodsBillsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入goodsBills")
 	public R<IPage<GoodsBillsVO>> list(GoodsBills goodsBills, Query query) {
-		IPage<GoodsBills> pages = goodsBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsBills));
-		return R.data(GoodsBillsWrapper.build().pageVO(pages));
+		//IPage<GoodsBills> pages = goodsBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsBills));
+		IPage<GoodsBillsVO> pages = GoodsBillsWrapper.build().pageVO(goodsBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsBills)));
+		pages.getRecords().forEach(this::searchUserInfo);
+		return R.data(pages);
 	}
 
 
@@ -114,7 +140,7 @@ public class GoodsBillsController extends BladeController {
 		return R.status(goodsBillsService.saveOrUpdate(goodsBills));
 	}
 
-	
+
 	/**
 	 * 删除 订单
 	 */
@@ -125,5 +151,5 @@ public class GoodsBillsController extends BladeController {
 		return R.status(goodsBillsService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/java/org/springblade/ldt/bills/entity/GoodsBills.java

@@ -66,6 +66,11 @@ public class GoodsBills extends TenantEntity {
 	*/
 		@ApiModelProperty(value = "取餐方式")
 		private String takeType;
+	/**
+	 * 取餐时间
+	 */
+	@ApiModelProperty(value = "取餐时间")
+	private LocalDateTime takeTime;
 	/**
 	* 订单json信息
 	*/

src/main/java/org/springblade/ldt/bills/mapper/GoodsBillsMapper.xml

@@ -17,6 +17,7 @@
         <result column="bills_id" property="billsId"/>
         <result column="order_status" property="orderStatus"/>
         <result column="take_type" property="takeType"/>
+        <result column="take_time" property="takeTime"/>
         <result column="goods_preview" property="goodsPreview"/>
         <result column="goods_total_num" property="goodsTotalNum"/>
         <result column="total_price" property="totalPrice"/>

src/main/java/org/springblade/ldt/bills/vo/GoodsBillsVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.ldt.bills.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.ldt.bills.entity.GoodsBills;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,4 +34,10 @@ import io.swagger.annotations.ApiModel;
 public class GoodsBillsVO extends GoodsBills {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "接单者")
+	private String taker;
+
+	@ApiModelProperty(value = "付款人")
+	private String payer;
+
 }