Merge branch 'master_pay'

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/Coupon.java

@@ -27,6 +27,7 @@ public class Coupon implements Serializable {
 	public static final Integer CHANNEL_RENT = 1;
 	public static final Integer CHANNEL_TOUR = 2;
 	public static final Integer CHANNEL_CAMPSITE = 3;
+	public static final Integer CHANNEL_MEMBER = 4;
 
 	    /**
     *  主键id

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/UserCouponVo.java

@@ -59,11 +59,17 @@ public class UserCouponVo {
 	@ApiModelProperty(value = "开始时间", hidden = true )
 	private Long startTime;
 
+
 	/**
 	 *  到期时间
 	 */
 	@ApiModelProperty(value = "到期时间", hidden = true )
 	private Long expireTime;
+
+	
+	@ApiModelProperty(value = "到期时间字符串")
+	private String expireDate;
+
 	
 	/**
      *  使用时间

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -124,9 +124,12 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         if(type==1){
             startTime=coupon.getStartTime();
             expireTime=coupon.getValidEndTime();
-        }else {
+        }else if (type==2){
             startTime=expireTime;
             expireTime+=DAY*coupon.getValidDays();
+        } else {
+            startTime=expireTime;
+            expireTime=-1L;
         }
         String ticker_no=Snowflake.build()+"";
         UserCoupon userCoupon=new UserCoupon();

xx-activity/xx-activity-server/src/main/resources/mapper/UserCouponMapper.xml

@@ -13,6 +13,7 @@
         <result property="crtTime" column="crt_time"/>
         <result property="startTime" column="start_time"/>
         <result property="expireTime" column="expire_time"/>
+        <result property="expireDate" column="expireDate"/>
         <result property="useTime" column="use_time"/>
         <result property="title" column="title"/>
         <result property="subtitle" column="subtitle"/>
@@ -32,20 +33,20 @@
 
     <select id="getUserCouponsByType" resultMap="userCouponMap">
         SELECT
-        *
+        *,IF(expire_time=-1,'永久有效',CONCAT('有效期至',FROM_UNIXTIME(expire_time/1000,'%Y-%m-%d'))) as expireDate
         FROM
         user_coupon u
         LEFT JOIN coupon c ON u.coupon_id = c.id
         WHERE
         u.is_del = 0 and u.user_id=#{userId}
         <if test="type==0">
-            and u.is_use=0 and u.expire_time >=#{time}
+            and u.is_use=0 and (u.expire_time >=#{time} or u.expire_time=-1)
         </if>
         <if test="type==1">
             and u.is_use=1
         </if>
         <if test="type==2">
-            and u.is_use=0 and u.expire_time &lt;#{time}
+            and u.is_use=0 and u.expire_time &lt;#{time} and u.expire_time!=-1
         </if>
         <if test="channel!=null and channel!=''">
             and (c.channel=#{channel} or c.channel=0 )

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -293,4 +293,9 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "促成人联系方式")
 	@Column(name = "facilitate_phone")
 	String facilitatePhone;
+
+	//支付类型
+	@ApiModelProperty(value = "支付方式")
+	@Column(name = "pay_way")
+	private Integer payWay;
 }

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-api/src/main/java/com/xxfc/platform/order/pojo/pay/NotifyUrlDTO.java

@@ -20,4 +20,8 @@ public class NotifyUrlDTO {
     //支付类型
     @ApiModelProperty(value = "支付类型")
     private Integer type;
+
+    //支付类型
+    @ApiModelProperty(value = "支付方式")
+    private Integer payWay;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -563,7 +563,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
      * @param tradeNo
      */
     @Transactional
-    public void payNotifyHandle(String orderNo, String tradeNo, Integer type) {
+    public void payNotifyHandle(String orderNo, String tradeNo, Integer type, Integer payWay) {
         OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
         OrderTourDetail otd = new OrderTourDetail();
         OrderMemberDetail omd = new OrderMemberDetail();
@@ -578,6 +578,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 setHasPay(SYS_TRUE);
                 setPayTime(System.currentTimeMillis());
                 setPayOrigin(type);
+                setPayWay(payWay);
                 setVersion(baseOrder.getVersion());
             }};
 

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

@@ -283,7 +283,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     public ObjectRestResponse notifyUrl(NotifyUrlDTO dto) {
         //判断是否成功，并且订单是未支付状态，则添加支付编号和修改状态
         if (StrUtil.isNotBlank(dto.getOrderNo())) {
-            baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo(), dto.getType());
+            baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo(), dto.getType(), dto.getPayWay());
         } else {
             log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
         }

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);
         }
     }
     /**

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

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
@@ -99,6 +100,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
 
     @PostConstruct
     public void init() {
+        this.channel = Coupon.CHANNEL_MEMBER;
         this.orderTypeEnum = OrderTypeEnum.MEMBER;
     }