Merge branch 'master_pay' of http://113.105.137.151:22280/youjj/cloud-platform into master_pay

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddMemberDTO.java

@@ -15,4 +15,10 @@ public class AddMemberDTO extends AddOrderCommonDTO{
     @ApiModelProperty(value = "会员等级")
     private Integer memberLevel;
 
+    /**
+     * 优惠券*
+     */
+    @ApiModelProperty(value = "优惠卷卷号")
+    private String tickerNos;
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderMemberController.java

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
@@ -46,7 +47,8 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
     @ApiOperation(value = "确认会员订单")
     public ObjectRestResponse<BaseOrder> add(@RequestBody AddMemberDTO dto) {
         MemberBO bo = BeanUtil.toBean(dto, MemberBO.class);
-
+        bo.setTickerNo(StrUtil.isNotBlank(dto.getTickerNos())?
+                StrUtil.splitTrim(dto.getTickerNos(), ","):null);
         //查询会员等级实体
 //        bo.setBaseUserMemberLevel(userFeign.memberEntityList(BeanUtil.beanToMap(new BaseUserMemberLevel(){{
 //            setId(dto.getMemberLevelId());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -150,8 +150,8 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         if(BigDecimal.ZERO.compareTo(realAmount) > 0) {
             throw new BaseException(ResultCode.FAILED_CODE);
         }else if(BigDecimal.ZERO.compareTo(realAmount) == 0) {
-            //直接支付
-            baseOrderBiz.payNotifyHandle(detail.getOrder().getNo(), null, detail.getOrderOrigin());
+            //直接支付 0表示不需要支付
+            baseOrderBiz.payNotifyHandle(detail.getOrder().getNo(), null, detail.getOrderOrigin(), 0);
         }
     }
     /**