Merge remote-tracking branch 'remotes/origin/developer' into developerA

# Conflicts:
#	src/main/java/com/caimei365/order/controller/PayNonOrderApi.java
#	src/main/java/com/caimei365/order/mapper/PayOrderMapper.java
#	src/main/java/com/caimei365/order/model/po/DiscernReceiptPo.java
#	src/main/java/com/caimei365/order/model/po/OrderReceiptRelationPo.java
#	src/main/java/com/caimei365/order/model/po/SplitAccountPo.java
#	src/main/java/com/caimei365/order/model/vo/OrderPayLinkVo.java
#	src/main/java/com/caimei365/order/service/PayNonOrderService.java
#	src/main/java/com/caimei365/order/service/impl/PayNonOrderServiceImpl.java
#	src/main/resources/mapper/BaseMapper.xml
#	src/main/resources/mapper/PayOrderMapper.xml

src/main/java/com/caimei365/order/controller/CartSellerApi.java

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+
 import java.util.Map;
 
 /**

src/main/java/com/caimei365/order/controller/PayNonOrderApi.java

@@ -2,6 +2,7 @@ package com.caimei365.order.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.caimei365.order.model.ResponseJson;
+import com.caimei365.order.model.dto.PayCouponDto;
 import com.caimei365.order.model.dto.PaySecondDto;
 import com.caimei365.order.model.dto.PayVipDto;
 import com.caimei365.order.service.PayNonOrderService;
@@ -21,7 +22,7 @@ import java.security.spec.InvalidKeySpecException;
  * @author : Charles
  * @date : 2021/9/27
  */
-@Api(tags="其他(非订单)支付API")
+@Api(tags = "其他(非订单)支付API")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/order/pay")
@@ -31,16 +32,17 @@ public class PayNonOrderApi {
 
     /**
      * 二手发布-微信线上支付
+     *
      * @param paySecondDto {
-     *               productId      二手发布商品id
-     *               returnUrl     页面回调地址
-     *               code          微信小程序code
-     *               state         微信公众号state参数
-     * }
+     *                     productId      二手发布商品id
+     *                     returnUrl     页面回调地址
+     *                     code          微信小程序code
+     *                     state         微信公众号state参数
+     *                     }
      */
     @ApiOperation("二手发布-微信线上支付（旧：/PayOrder/appletsSecondHandPay）(/PayOrder/secondHandPay[WEIXIN])")
     @PostMapping("/second/wechat")
-    public ResponseJson<JSONObject> paySecondByWeChat(PaySecondDto paySecondDto, @RequestHeader HttpHeaders headers){
+    public ResponseJson<JSONObject> paySecondByWeChat(PaySecondDto paySecondDto, @RequestHeader HttpHeaders headers) {
         if (null == paySecondDto.getProductId()) {
             return ResponseJson.error("二手商品Id不能为空！", null);
         }
@@ -52,14 +54,15 @@ public class PayNonOrderApi {
 
     /**
      * 二手发布-支付宝线上支付
+     *
      * @param paySecondDto {
-     *               productId      二手发布商品id
-     *               returnUrl     页面回调地址
-     * }
+     *                     productId      二手发布商品id
+     *                     returnUrl     页面回调地址
+     *                     }
      */
     @ApiOperation("二手发布-支付宝线上支付（旧：/PayOrder/secondHandPay[ALIPAY]）")
     @PostMapping("/second/alipay")
-    public ResponseJson<JSONObject> paySecondByAlipay(PaySecondDto paySecondDto, @RequestHeader HttpHeaders headers){
+    public ResponseJson<JSONObject> paySecondByAlipay(PaySecondDto paySecondDto, @RequestHeader HttpHeaders headers) {
         if (null == paySecondDto.getProductId()) {
             return ResponseJson.error("二手商品Id不能为空！", null);
         }
@@ -71,16 +74,17 @@ public class PayNonOrderApi {
 
     /**
      * 二手发布-银联线上支付
+     *
      * @param paySecondDto {
-     *               productId     二手发布商品id
-     *               returnUrl     页面回调地址
-     *               bankCode      银行编码(银联支付使用)
-     *               userType      用户类型(银联支付使用)企业:ENTERPRISE，个人:USER
-     * }
+     *                     productId     二手发布商品id
+     *                     returnUrl     页面回调地址
+     *                     bankCode      银行编码(银联支付使用)
+     *                     userType      用户类型(银联支付使用)企业:ENTERPRISE，个人:USER
+     *                     }
      */
     @ApiOperation("二手发布-银联线上支付（旧：/PayOrder/secondHandPay[UNIONPAY]）")
     @PostMapping("/second/union")
-    public ResponseJson<JSONObject> paySecondByUnionPay(PaySecondDto paySecondDto, @RequestHeader HttpHeaders headers){
+    public ResponseJson<JSONObject> paySecondByUnionPay(PaySecondDto paySecondDto, @RequestHeader HttpHeaders headers) {
         if (null == paySecondDto.getProductId()) {
             return ResponseJson.error("二手商品Id不能为空！", null);
         }
@@ -110,16 +114,17 @@ public class PayNonOrderApi {
 
     /**
      * 升级超级会员-微信线上支付
+     *
      * @param payVipDto {
      *                  vipRecordId   会员购买记录Id
      *                  returnUrl     页面回调地址
      *                  code          微信小程序code
      *                  state         微信公众号state参数
-     * }
+     *                  }
      */
     @ApiOperation("升级超级会员-微信线上支付")
     @PostMapping("/vip/wechat")
-    public ResponseJson<JSONObject> paySuperVipByWeChat(PayVipDto payVipDto, @RequestHeader HttpHeaders headers){
+    public ResponseJson<JSONObject> paySuperVipByWeChat(PayVipDto payVipDto, @RequestHeader HttpHeaders headers) {
         if (null == payVipDto.getVipRecordId()) {
             return ResponseJson.error("会员购买记录Id不能为空！", null);
         }
@@ -131,14 +136,15 @@ public class PayNonOrderApi {
 
     /**
      * 升级超级会员-支付宝线上支付
+     *
      * @param payVipDto {
      *                  vipRecordId   会员购买记录Id
      *                  returnUrl     页面回调地址
-     * }
+     *                  }
      */
     @ApiOperation("升级超级会员-支付宝线上支付")
     @PostMapping("/vip/alipay")
-    public ResponseJson<JSONObject> paySuperVipByAlipay(PayVipDto payVipDto, @RequestHeader HttpHeaders headers){
+    public ResponseJson<JSONObject> paySuperVipByAlipay(PayVipDto payVipDto, @RequestHeader HttpHeaders headers) {
         if (null == payVipDto.getVipRecordId()) {
             return ResponseJson.error("会员购买记录Id不能为空！", null);
         }
@@ -150,16 +156,17 @@ public class PayNonOrderApi {
 
     /**
      * 升级超级会员-银联线上支付
+     *
      * @param payVipDto {
-     *               vipRecordId   会员购买记录Id
-     *               returnUrl     页面回调地址
-     *               bankCode      银行编码(银联支付使用)
-     *               userType      用户类型(银联支付使用)企业:ENTERPRISE，个人:USER
-     * }
+     *                  vipRecordId   会员购买记录Id
+     *                  returnUrl     页面回调地址
+     *                  bankCode      银行编码(银联支付使用)
+     *                  userType      用户类型(银联支付使用)企业:ENTERPRISE，个人:USER
+     *                  }
      */
     @ApiOperation("升级超级会员-银联线上支付")
     @PostMapping("/vip/union")
-    public ResponseJson<JSONObject> paySuperVipByUnionPay(PayVipDto payVipDto, @RequestHeader HttpHeaders headers){
+    public ResponseJson<JSONObject> paySuperVipByUnionPay(PayVipDto payVipDto, @RequestHeader HttpHeaders headers) {
         if (null == payVipDto.getVipRecordId()) {
             return ResponseJson.error("会员购买记录Id不能为空！", null);
         }
@@ -189,10 +196,11 @@ public class PayNonOrderApi {
 
     /**
      * 升级超级会员-线上退款
+     *
      * @param payVipDto {
-     *               vipRecordId   会员购买记录Id
-     *               code          退款口令
-     * }
+     *                  vipRecordId   会员购买记录Id
+     *                  code          退款口令
+     *                  }
      */
     @ApiOperation("升级超级会员-线上退款）")
     @PostMapping("/vip/online/refund")
@@ -206,6 +214,157 @@ public class PayNonOrderApi {
         return payNonOrderService.superVipOnlineRefund(payVipDto);
     }
 
+
+    @ApiOperation("购买价值优惠券-获取购买记录id")
+    @PostMapping("/coupon/record")
+    public ResponseJson<PayCouponDto> payCouponGetRecord(PayCouponDto payCouponDto, @RequestHeader HttpHeaders headers) {
+        if (null == payCouponDto.getCouponId()) {
+            return ResponseJson.error("优惠券Id不能为空！", null);
+        }
+        if (null == payCouponDto.getUserId()) {
+            return ResponseJson.error("userId不能为空！", null);
+        }
+        return payNonOrderService.getCouponRecord(payCouponDto, headers);
+    }
+
+    /**
+     * 升级超级会员-微信线上支付
+     *
+     * @param payCouponDto {
+     *                     couponId      购买优惠券Id
+     *                     userId        userId
+     *                     couponRecordId  购买记录id
+     *                     returnUrl     页面回调地址
+     *                     code          微信小程序code
+     *                     state         微信公众号state参数
+     *                     }
+     */
+    @ApiOperation("购买价值优惠券-微信线上支付")
+    @PostMapping("/coupon/wechat")
+    public ResponseJson<JSONObject> payCouponByWeChat(PayCouponDto payCouponDto, @RequestHeader HttpHeaders headers) {
+        if (null == payCouponDto.getCouponRecordId()) {
+            return ResponseJson.error("购买记录id不能为空！", null);
+        }
+        if (null == payCouponDto.getSource()) {
+            return ResponseJson.error("领取渠道不能为空！", null);
+        }
+        if (null == payCouponDto.getCouponId()) {
+            return ResponseJson.error("优惠券Id不能为空！", null);
+        }
+        if (null == payCouponDto.getUserId()) {
+            return ResponseJson.error("userId不能为空！", null);
+        }
+        if (StringUtils.isEmpty(payCouponDto.getCode())) {
+            return ResponseJson.error("微信code不能为空！", null);
+        }
+        return payNonOrderService.payCouponByWeChat(payCouponDto, headers);
+    }
+
+    /**
+     * 购买价值优惠券-支付宝线上支付
+     *
+     * @param payCouponDto {
+     *                     couponRecordId  购买记录id
+     *                     couponId      购买优惠券Id
+     *                     userId        userId
+     *                     returnUrl     页面回调地址
+     *                     }
+     */
+    @ApiOperation("购买价值优惠券-支付宝线上支付")
+    @PostMapping("/coupon/alipay")
+    public ResponseJson<JSONObject> payCouponByAlipay(PayCouponDto payCouponDto, @RequestHeader HttpHeaders headers) {
+        if (null == payCouponDto.getCouponRecordId()) {
+            return ResponseJson.error("购买记录id不能为空！", null);
+        }
+        if (null == payCouponDto.getSource()) {
+            return ResponseJson.error("领取渠道不能为空！", null);
+        }
+        if (null == payCouponDto.getCouponId()) {
+            return ResponseJson.error("优惠券Id不能为空！", null);
+        }
+        if (StringUtils.isEmpty(payCouponDto.getReturnUrl())) {
+            return ResponseJson.error("回调地址不能为空！", null);
+        }
+        return payNonOrderService.payCouponByAlipay(payCouponDto, headers);
+    }
+
+    /**
+     * 购买价值优惠券-银联线上支付
+     *
+     * @param payCouponDto {
+     *                     couponRecordId  购买记录id
+     *                     userID        用户id
+     *                     couponId      购买优惠券Id
+     *                     returnUrl     页面回调地址
+     *                     bankCode      银行编码(银联支付使用)
+     *                     userType      用户类型(银联支付使用)企业:ENTERPRISE，个人:USER
+     *                     }
+     */
+    @ApiOperation("购买价值优惠券-银联线上支付")
+    @PostMapping("/coupon/union")
+    public ResponseJson<JSONObject> payCouponByUnionPay(PayCouponDto payCouponDto, @RequestHeader HttpHeaders headers) {
+        if (null == payCouponDto.getCouponRecordId()) {
+            return ResponseJson.error("购买记录id不能为空！", null);
+        }
+        if (null == payCouponDto.getSource()) {
+            return ResponseJson.error("领取渠道不能为空！", null);
+        }
+        if (null == payCouponDto.getUserId()) {
+            return ResponseJson.error("用户id不能为空！", null);
+        }
+        if (null == payCouponDto.getCouponId()) {
+            return ResponseJson.error("优惠券Id不能为空！", null);
+        }
+        if (StringUtils.isEmpty(payCouponDto.getReturnUrl())) {
+            return ResponseJson.error("回调地址不能为空！", null);
+        }
+        if (StringUtils.isEmpty(payCouponDto.getBankCode())) {
+            return ResponseJson.error("银行编码不能为空！", null);
+        }
+        if (StringUtils.isEmpty(payCouponDto.getUserType())) {
+            return ResponseJson.error("银行用户类型不能为空！", null);
+        }
+        return payNonOrderService.payCouponUnionPay(payCouponDto, headers);
+    }
+
+    /**
+     * 购买优惠券-查询是否购买成功
+     */
+    @ApiOperation("购买优惠券-查询是否购买成功")
+    @GetMapping("/coupon/check")
+    public ResponseJson couponCheck(Integer couponRecordId) {
+        if (null == couponRecordId) {
+            return ResponseJson.error("购买记录id不能为空！", null);
+        }
+        return payNonOrderService.couponCheck(couponRecordId);
+    }
+
+
+    /**
+     * 购买优惠券-支付回调
+     */
+    @ApiOperation("购买优惠券-支付回调")
+    @GetMapping("/coupon/callback")
+    public String couponCallback(String data) throws NoSuchAlgorithmException, InvalidKeySpecException {
+        if (StringUtils.isBlank(data)) {
+            return "回调参数失败";
+        }
+        return payNonOrderService.couponCallback(data);
+    }
+
+    /**
+     * 购买优惠券-查询是否购买成功
+     */
+    @ApiOperation("购买超级会员-查询是否购买成功")
+    @GetMapping("/vip/check")
+    public ResponseJson vipCheck(Integer recordId) {
+        if (null == recordId) {
+            return ResponseJson.error("购买记录id不能为空！", null);
+        }
+        return payNonOrderService.vipCheck(recordId);
+    }
+
+
     /**
      * 开通认证通会员-微信线上支付
      * @param payVipDto {

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -187,7 +187,7 @@ public interface OrderClubMapper {
     /**
      * 根据clubCouponId获取优惠券
      */
-    CouponVo getClubCouponById(Integer clubCouponId);
+    CouponVo getClubCouponById(Integer clubCouponId,Integer userId);
     /**
      * 修改优惠券使用情况
      */
@@ -212,4 +212,6 @@ public interface OrderClubMapper {
      * 机构最新订单Id
      */
     Integer getLatestOrderId(Integer userId);
+
+    Integer findUserId(Integer orderId);
 }

src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -235,4 +235,14 @@ public interface PayOrderMapper {
      * @param amount  本次待付款金额
      */
     OrderPayLinkVo getAuthVipPayLink(@Param("recordId") int recordId, @Param("amount") Double amount);
+
+    Double getCouponPrice(Integer couponId);
+
+    void insertCouponRecord(CouponRecordPo cr);
+
+    void updateCouponRecord(Integer recordId);
+
+    Integer findPayStatus(Integer recordId);
+
+    Integer findClubType(Integer userId);
 }

src/main/java/com/caimei365/order/model/bo/PayParamBo.java

@@ -30,6 +30,10 @@ public class PayParamBo implements Serializable {
      * 会员购买记录Id
      */
     private Integer vipRecordId;
+    /**
+     * 优惠券购买记录id
+     */
+    private Integer couponRecordId;
     /**
      * 会员套餐id
      */
@@ -81,4 +85,13 @@ public class PayParamBo implements Serializable {
      * 个人：USER
      */
     private String userType;
+    /**
+     * 购买优惠券id
+     */
+    private Integer couponId;
+    /**
+     *  1小程序 2网站
+     */
+    @ApiModelProperty("领取渠道1小程序 2网站")
+    private Integer source;
 }

src/main/java/com/caimei365/order/model/dto/PayCouponDto.java

@@ -0,0 +1,59 @@
+package com.caimei365.order.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PayCouponDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 购买优惠券Id
+     */
+    @ApiModelProperty("购买优惠券Id")
+    private Integer couponId;
+    /**
+     * userId
+     */
+    @ApiModelProperty("userId")
+    private Integer userId;
+    /**
+     * 购买记录id
+     */
+    @ApiModelProperty("购买记录id")
+    private Integer couponRecordId;
+    /**
+     * 页面回调地址
+     */
+    @ApiModelProperty("页面回调地址")
+    private String returnUrl;
+    /**
+     * 微信小程序code,微信小程序支付使用
+     */
+    @ApiModelProperty("微信小程序code")
+    private String code;
+    /**
+     * 微信公众号state参数
+     */
+    @ApiModelProperty("微信公众号state参数")
+    private String state;
+    /**
+     * 银行编码(银联支付使用)
+     */
+    @ApiModelProperty("银行编码(银联支付使用)")
+    private String bankCode;
+    /**
+     * 用户类型(银联支付使用)
+     * 企业：ENTERPRISE
+     * 个人：USER
+     */
+    @ApiModelProperty("用户类型(银联支付使用)企业:ENTERPRISE，个人:USER")
+    private String userType;
+
+    /**
+     *  1小程序 2网站
+     */
+    @ApiModelProperty("领取渠道1小程序 2网站")
+    private Integer source;
+}

src/main/java/com/caimei365/order/model/po/CouponRecordPo.java

@@ -0,0 +1,15 @@
+package com.caimei365.order.model.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CouponRecordPo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    private Integer couponId;
+    private Integer payStatus;
+    private Integer userId;
+}

src/main/java/com/caimei365/order/model/po/OrderReceiptRelationPo.java

@@ -37,6 +37,10 @@ public class OrderReceiptRelationPo implements Serializable {
      *  超级会员购买记录Id
      */
     private Integer vipRecordId;
+    /**
+     * 优惠券购买记录id
+     */
+    private Integer couponRecordId;
     /**
      *  认证通会员购买记录Id
      */

src/main/java/com/caimei365/order/model/po/SplitAccountPo.java

@@ -36,6 +36,10 @@ public class SplitAccountPo implements Serializable {
      * 超级会员套餐id
      */
     private Integer vipRecordId;
+    /**
+     * 优惠券购买记录id
+     */
+    private Integer couponRecordId;
     /**
      * 认证通会员购买记录id
      */

src/main/java/com/caimei365/order/model/vo/CouponVo.java

@@ -15,6 +15,7 @@ import java.util.List;
  */
 @Data
 public class CouponVo implements Serializable {
+
     /**
      * 用户关联优惠id
      */
@@ -41,12 +42,19 @@ public class CouponVo implements Serializable {
     @JsonFormat(pattern = "yyyy.MM.dd", timezone = "GMT+8")
     private Date startDate;
 
+    /**
+     * 价值优惠券购买金额
+     */
+    private Double moneyCouponPrice;
+    /**
+     * 是否是价值优惠券，1是，2不是
+     */
+    private Integer moneyCouponFlag;
     /**
      * 使用结束时间（有效期）
      */
     @JsonFormat(pattern = "yyyy.MM.dd", timezone = "GMT+8")
     private Date endDate;
-
     /**
      * 劵类型 0活动券 1品类券 2用户专享券 3店铺券 4新用户券
      */
@@ -71,7 +79,6 @@ public class CouponVo implements Serializable {
      * 优惠品类：1产品 2仪器(品类券有效)
      */
     private Integer categoryType;
-
     /**
      * 供应商名称
      */
@@ -82,6 +89,10 @@ public class CouponVo implements Serializable {
      */
     private Integer useStatus;
 
+    /**
+     * 价值优惠券属性，1，意向券，2，定向券
+     */
+    private Integer moneyCouponType;
     /**
      * 领取状态: 0未领取 1已领取 (前端使用)
      */

src/main/java/com/caimei365/order/model/vo/OrderPayLinkVo.java

@@ -25,6 +25,10 @@ public class OrderPayLinkVo implements Serializable {
      * 会员购买记录Id
      */
     private Integer vipRecordId;
+    /**
+     * 优惠券购买记录id
+     */
+    private Integer couponRecordId;
     /**
      * 认证通会员购买记录Id
      */

src/main/java/com/caimei365/order/service/CartSellerService.java

@@ -3,7 +3,9 @@ package com.caimei365.order.service;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.AgainBuyDto;
 import com.caimei365.order.model.dto.SellerCartDto;
+import com.caimei365.order.model.vo.CouponVo;
 
+import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/com/caimei365/order/service/PayNonOrderService.java

@@ -2,6 +2,7 @@ package com.caimei365.order.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.caimei365.order.model.ResponseJson;
+import com.caimei365.order.model.dto.PayCouponDto;
 import com.caimei365.order.model.dto.PaySecondDto;
 import com.caimei365.order.model.dto.PayVipDto;
 import org.springframework.http.HttpHeaders;
@@ -90,6 +91,26 @@ public interface PayNonOrderService {
      */
     ResponseJson<JSONObject> superVipOnlineRefund(PayVipDto payVipDto) throws NoSuchAlgorithmException, InvalidKeySpecException;
 
+    /**
+     * 微信购买优惠券
+     * @param payCouponDto
+     * @param headers
+     * @return
+     */
+    ResponseJson<JSONObject> payCouponByWeChat(PayCouponDto payCouponDto, HttpHeaders headers);
+
+    String couponCallback(String data) throws NoSuchAlgorithmException, InvalidKeySpecException;
+
+    ResponseJson<JSONObject> payCouponByAlipay(PayCouponDto payCouponDto, HttpHeaders headers);
+
+    ResponseJson<JSONObject> payCouponUnionPay(PayCouponDto payCouponDto, HttpHeaders headers);
+
+    ResponseJson<PayCouponDto> getCouponRecord(PayCouponDto payCouponDto, HttpHeaders headers);
+
+    ResponseJson couponCheck(Integer recordId);
+
+    ResponseJson vipCheck(Integer recordId);
+
     /**
      * 开通认证通会员-微信线上支付
      * @param payVipDto {

src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -146,7 +146,7 @@ public class CartClubServiceImpl implements CartClubService {
                     boolean taxFlag = productService.setCartItemImgAndTax(cartItemVo);
                     // 商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
                     Integer visibility = cartItemVo.getVisibility();
-                    boolean visibleFlag = visibility == 3 || visibility==2 || (visibility == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (visibility == 4 && finalUserClubType == 1);
+                    boolean visibleFlag = visibility == 3 || visibility == 2 || (visibility == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (visibility == 4 && finalUserClubType == 1);
                     if (!visibleFlag) {
                         //不可见商品 不加入失效商品，直接去除
                         productIterator.remove();
@@ -554,12 +554,12 @@ public class CartClubServiceImpl implements CartClubService {
             Integer finalUserClubType = userClubType;
             Integer finalUserIdentity = userIdentity;
             cartList.removeIf(cartItemVo -> !(
-                // visibility商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
-                (cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility()==2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1))
-                // 价格可见度： 0公开价格，1不公开价格，2仅对会员机构公开，3仅对医美机构公开
-                || (cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && finalUserClubType == 1))
-                // 是否库存充足
-                || (cartItemVo.getStock() != null && cartItemVo.getStock() > 0 && cartItemVo.getStock() >= cartItemVo.getMin() && cartItemVo.getStock() >= cartItemVo.getNumber())
+                    // visibility商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
+                    (cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility() == 2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1))
+                            // 价格可见度： 0公开价格，1不公开价格，2仅对会员机构公开，3仅对医美机构公开
+                            || (cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && finalUserClubType == 1))
+                            // 是否库存充足
+                            || (cartItemVo.getStock() != null && cartItemVo.getStock() > 0 && cartItemVo.getStock() >= cartItemVo.getMin() && cartItemVo.getStock() >= cartItemVo.getNumber())
             ));
             cartList.forEach(cartItemVo -> {
                 // 设置商品图片及税费
@@ -695,9 +695,9 @@ public class CartClubServiceImpl implements CartClubService {
      * @param cartDto {
      *                userId       用户ID
      *                productInfo  商品及数量信息:[   // 商品id，数量
-     *                                           {"productId": 2789, "productCount": 1},
-     *                                           {"productId": 2790, "productCount": 1}
-     *                                          ]
+     *                {"productId": 2789, "productCount": 1},
+     *                {"productId": 2790, "productCount": 1}
+     *                ]
      *                }
      */
     @Override
@@ -709,10 +709,10 @@ public class CartClubServiceImpl implements CartClubService {
             log.error("批量添加购物车参数解析异常try-catch:", e);
             return ResponseJson.error("商品及数量信息参数解析异常！", null);
         }
-        if (null == productInfo || productInfo.isEmpty()){
+        if (null == productInfo || productInfo.isEmpty()) {
             return ResponseJson.error("商品及数量信息参数异常！", null);
         }
-        for (Object infoObject: productInfo) {
+        for (Object infoObject : productInfo) {
             JSONObject tempObj = (JSONObject) infoObject;
             Integer productId = (Integer) tempObj.get("productId");
             Integer productCount = (Integer) tempObj.get("productCount");
@@ -812,12 +812,12 @@ public class CartClubServiceImpl implements CartClubService {
             int finalUserIdentity = userIdentity;
             int finalUserClubType = userClubType;
             cartList.removeIf(cartItemVo -> !(
-                // visibility商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
-                (cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility()==2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1))
-                // 价格可见度： 0公开价格，1不公开价格，2仅对会员机构公开，3仅对医美机构公开
-                || (cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && finalUserClubType == 1))
-                // 是否库存充足
-                || (cartItemVo.getStock() != null && cartItemVo.getStock() > 0 && cartItemVo.getStock() >= cartItemVo.getMin() && cartItemVo.getStock() >= cartItemVo.getNumber())
+                    // visibility商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
+                    (cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility() == 2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1))
+                            // 价格可见度： 0公开价格，1不公开价格，2仅对会员机构公开，3仅对医美机构公开
+                            || (cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && finalUserClubType == 1))
+                            // 是否库存充足
+                            || (cartItemVo.getStock() != null && cartItemVo.getStock() > 0 && cartItemVo.getStock() >= cartItemVo.getMin() && cartItemVo.getStock() >= cartItemVo.getNumber())
             ));
             return cartList.size();
         } else {
@@ -860,12 +860,16 @@ public class CartClubServiceImpl implements CartClubService {
         List<Integer> shopIds = new ArrayList<>();
         // 用户身份
         Integer userIdentity = baseMapper.getIdentityByUserId(userId);
-        if (null == userIdentity) {userIdentity = 0;}
+        if (null == userIdentity) {
+            userIdentity = 0;
+        }
         // 会员机构类型：1医美，2生美
         Integer userClubType = 0;
         if (userIdentity == 2) {
             userClubType = cartClubMapper.getClubTypeById(userId);
-            if (null == userClubType) {userClubType = 0;}
+            if (null == userClubType) {
+                userClubType = 0;
+            }
         }
         // 超级会员标识
         Integer svipUserId = baseMapper.getSvipUserIdByUserId(userId);
@@ -911,7 +915,7 @@ public class CartClubServiceImpl implements CartClubService {
                     List<CartItemVo> productList = cartClubMapper.getCartProductsByShopIdAndProductIds(userId, shop.getShopId(), finalIdList);
                     if (null != productList && productList.size() > 0) {
                         // 去除不可见商品，visibility商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
-                        productList.removeIf(cartItemVo -> !(cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility()==2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1)));
+                        productList.removeIf(cartItemVo -> !(cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility() == 2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1)));
                         // 去除价格不可见商品，价格可见度： 0公开价格，1不公开价格，2仅对会员机构公开，3仅对医美机构公开
                         productList.removeIf(cartItemVo -> !(cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && finalUserClubType == 1)));
                         // 去除库存不足商品
@@ -1212,12 +1216,16 @@ public class CartClubServiceImpl implements CartClubService {
         List<String> productIdList = new ArrayList<>();
         // 用户身份
         Integer userIdentity = baseMapper.getIdentityByUserId(userId);
-        if (null == userIdentity) {userIdentity = 0;}
+        if (null == userIdentity) {
+            userIdentity = 0;
+        }
         // 会员机构类型：1医美，2生美
         Integer userClubType = 0;
         if (userIdentity == 2) {
             userClubType = cartClubMapper.getClubTypeById(userId);
-            if (null == userClubType) {userClubType = 0;}
+            if (null == userClubType) {
+                userClubType = 0;
+            }
         }
         // 超级会员标识
         Integer svipUserId = baseMapper.getSvipUserIdByUserId(userId);
@@ -1271,7 +1279,7 @@ public class CartClubServiceImpl implements CartClubService {
                     productList.forEach(p -> p.setNumber(productInfos.get(p.getProductId().toString())));
                     if (null != productList && productList.size() > 0) {
                         // 去除不可见商品，visibility商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
-                        productList.removeIf(cartItemVo -> !(cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility()==2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1)));
+                        productList.removeIf(cartItemVo -> !(cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility() == 2 || (cartItemVo.getVisibility() == 1 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && finalUserClubType == 1)));
                         // 去除价格不可见商品，价格可见度： 0公开价格，1不公开价格，2仅对会员机构公开，3仅对医美机构公开
                         productList.removeIf(cartItemVo -> !(cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (finalUserIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && finalUserClubType == 1)));
                         // 去除库存不足商品
@@ -1557,22 +1565,26 @@ public class CartClubServiceImpl implements CartClubService {
         }
         // 用户身份
         Integer userIdentity = baseMapper.getIdentityByUserId(cartDto.getUserId());
-        if (null == userIdentity) {userIdentity = 0;}
+        if (null == userIdentity) {
+            userIdentity = 0;
+        }
         // 会员机构类型：1医美，2生美
         Integer userClubType = 0;
         if (userIdentity == 2) {
             userClubType = cartClubMapper.getClubTypeById(cartDto.getUserId());
-            if (null == userClubType) {userClubType = 0;}
+            if (null == userClubType) {
+                userClubType = 0;
+            }
         }
         // 超级会员标识
         Integer svipUserId = baseMapper.getSvipUserIdByUserId(cartDto.getUserId());
         boolean svipUserFlag = null != svipUserId;
         // visibility商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见，4:仅医美机构可见
-        if (!(cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility()==2 || (cartItemVo.getVisibility() == 1 && (userIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && userClubType == 1))){
+        if (!(cartItemVo.getVisibility() == 3 || cartItemVo.getVisibility() == 2 || (cartItemVo.getVisibility() == 1 && (userIdentity == 2 || svipUserFlag)) || (cartItemVo.getVisibility() == 4 && userClubType == 1))) {
             return ResponseJson.error("商品不可见！", null);
         }
         // 价格可见度： 0公开价格，1不公开价格，2仅对会员机构公开，3仅对医美机构公开
-        if (!(cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (userIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && userClubType == 1))){
+        if (!(cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && (userIdentity == 2 || svipUserFlag)) || (cartItemVo.getPriceFlag() == 3 && userClubType == 1))) {
             return ResponseJson.error("商品价格不可见！", null);
         }
         cartItemVo.setNumber(cartDto.getProductCount());
@@ -1892,6 +1904,7 @@ public class CartClubServiceImpl implements CartClubService {
         Date registerTime = orderCommonMapper.getUserRegisterTime(userId);
         // 未领取的优惠券
         List<CouponVo> preCouponList = orderCommonMapper.getPrevCouponList(userId, registerTime);
+        preCouponList.forEach(p -> p.setCouponBtnType(0));
         //剔除超级会员优惠券
         List<Integer> vipCoupon = cartClubMapper.findVipCoupon();
         if (preCouponList != null && preCouponList.size() > 0) {
@@ -1901,6 +1914,7 @@ public class CartClubServiceImpl implements CartClubService {
         filterCoupon(source, productList, preCouponList);
         // 用户可用优惠券（已领取）
         List<CouponVo> couponList = orderCommonMapper.getClubCouponList(userId);
+        couponList.forEach(c -> c.setCouponBtnType(1));
         //剔除超级会员优惠券
         if (couponList != null && couponList.size() > 0) {
             couponList.removeIf(couponVo -> vipCoupon.contains(couponVo.getCouponId()));

src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

@@ -885,5 +885,4 @@ public class CartSellerServiceImpl implements CartSellerService {
         resultData.put("productIds", againBuyProductIds);
         return ResponseJson.success(resultData);
     }
-
 }

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -326,7 +326,7 @@ public class OrderClubServiceImpl implements OrderClubService {
         if (MathUtil.compare(order.getCouponAmount(), 0) > 0) {
             // 确认订单时才真正使用优惠券
             CouponOrderRecordPo couponOrderRecord = orderClubMapper.getOrderCouponRecord(orderId);
-            CouponVo coupon = orderClubMapper.getClubCouponById(couponOrderRecord.getClubCouponId());
+            CouponVo coupon = orderClubMapper.getClubCouponById(couponOrderRecord.getClubCouponId(),orderClubMapper.findUserId(orderId));
             if (coupon == null) {
                 return ResponseJson.error("订单内优惠券已被使用", null);
             } else {

src/main/java/com/caimei365/order/service/impl/PayNonOrderServiceImpl.java

@@ -3,11 +3,13 @@ package com.caimei365.order.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei365.order.components.WeChatService;
 import com.caimei365.order.mapper.BaseMapper;
+import com.caimei365.order.mapper.OrderClubMapper;
 import com.caimei365.order.mapper.OrderCommonMapper;
 import com.caimei365.order.mapper.PayOrderMapper;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.bo.PayParamBo;
 import com.caimei365.order.model.bo.VipRecordBo;
+import com.caimei365.order.model.dto.PayCouponDto;
 import com.caimei365.order.model.dto.PaySecondDto;
 import com.caimei365.order.model.dto.PayVipDto;
 import com.caimei365.order.model.po.*;
@@ -49,6 +51,8 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
     @Resource
     private OrderCommonMapper orderCommonMapper;
     @Resource
+    private OrderClubMapper orderClubMapper;
+    @Resource
     private WeChatService weChatService;
     @Value("${pay.second-notify-url}")
     private String secondHandUrl;
@@ -56,6 +60,8 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
     private String superVipUrl;
     @Value("${pay.auth-vip-notify-url}")
     private String authVipUrl;
+    @Value("${pay.coupon-notify-url}")
+    private String couponUrl;
     @Resource
     private RemoteCallService remoteCallService;
 
@@ -216,6 +222,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
             String sign = PayUtil.getPaySign(json, PayUtil.merKey);
             json.put("sign", sign);
             // 私钥加密
+            log.info("发送参数 json：" + json);
             String data = RSAUtil.privateEncrypt(json.toJSONString(), PayUtil.merKey);
             // 提交
             result = PayUtil.httpGet("https://platform.mhxxkj.com/paygateway/mbpay/order/v1", PayUtil.merAccount, data);
@@ -503,6 +510,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
             String sign = PayUtil.getPaySign(json, PayUtil.merKey);
             json.put("sign", sign);
             // 私钥加密
+            log.info("发送参数 json：" + json);
             String data = RSAUtil.privateEncrypt(json.toJSONString(), PayUtil.merKey);
             // 提交
             result = PayUtil.httpGet("https://platform.mhxxkj.com/paygateway/mbpay/order/v1", PayUtil.merAccount, data);
@@ -730,6 +738,311 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
         return ResponseJson.success(result);
     }
 
+    /**
+     * 微信买优惠券
+     *
+     * @param payCouponDto
+     * @param headers
+     * @return
+     */
+    @Override
+    public ResponseJson<JSONObject> payCouponByWeChat(PayCouponDto payCouponDto, HttpHeaders headers) {
+        Integer status = payOrderMapper.findPayStatus(payCouponDto.getCouponRecordId());
+        if (null != status && 1 == status) {
+            return ResponseJson.error("该笔记录已支付，请勿重复支付！", null);
+        }
+        PayParamBo tempParam = new PayParamBo();
+        // payDto -> payParam
+        BeanUtils.copyProperties(payCouponDto, tempParam);
+        ResponseJson<PayParamBo> jsonParam = getWeChatResponseJson(tempParam, headers);
+        if (-1 == jsonParam.getCode()) {
+            return ResponseJson.error(jsonParam.getMsg(), null);
+        }
+        PayParamBo payParam = jsonParam.getData();
+        // 获取优惠券价格
+        Double price = payOrderMapper.getCouponPrice(payCouponDto.getCouponId());
+        payParam.setPayAmount(MathUtil.mul(price, 100).intValue());
+        payParam.setNotifyUrl(couponUrl);
+        payParam.setCouponRecordId(payCouponDto.getCouponRecordId());
+        log.info("【购买价值优惠券微信支付】>>>>>>>>>>>couponId:" + payParam.getCouponId() + "，获取openId:" + payParam.getOpenId());
+        return toPayCoupon(payParam, headers);
+    }
+
+    /**
+     * 支付宝买优惠券
+     *
+     * @param headers
+     */
+    @Override
+    public ResponseJson<JSONObject> payCouponByAlipay(PayCouponDto payCouponDto, HttpHeaders headers) {
+        Integer status = payOrderMapper.findPayStatus(payCouponDto.getCouponRecordId());
+        if (null != status && 1 == status) {
+            return ResponseJson.error("该笔记录已支付，请勿重复支付！", null);
+        }
+        PayParamBo payParam = new PayParamBo();
+        // payDto -> payParam
+        BeanUtils.copyProperties(payCouponDto, payParam);
+        //支付宝支付
+        payParam.setPayWay("ALIPAY");
+        payParam.setPayType("ALIPAY_H5");
+        // 获取优惠券价格
+        Double price = payOrderMapper.getCouponPrice(payCouponDto.getCouponId());
+        payParam.setPayAmount(MathUtil.mul(price, 100).intValue());
+        payParam.setNotifyUrl(couponUrl);
+        payParam.setCouponRecordId(payCouponDto.getCouponRecordId());
+        log.info("【购买价值优惠券支付宝支付】>>>>>>>>>>>couponId:" + payParam.getCouponId());
+        return toPayCoupon(payParam, headers);
+    }
+
+    @Override
+    public ResponseJson<JSONObject> payCouponUnionPay(PayCouponDto payCouponDto, HttpHeaders headers) {
+        Integer status = payOrderMapper.findPayStatus(payCouponDto.getCouponRecordId());
+        if (null != status && 1 == status) {
+            return ResponseJson.error("该笔记录已支付，请勿重复支付！", null);
+        }
+        PayParamBo payParam = new PayParamBo();
+        // payDto -> payParam
+        BeanUtils.copyProperties(payCouponDto, payParam);
+        // 银联支付
+        payParam.setPayWay("UNIONPAY");
+        payParam.setPayType("GATEWAY_UNIONPAY");
+        // 获取会员套餐价格
+        Double price = payOrderMapper.getCouponPrice(payCouponDto.getCouponId());
+        if ("ENTERPRISE".equals(payCouponDto.getUserType()) && price <= 8) {
+            return ResponseJson.error("企业网银支付金额低于手续费！", null);
+        }
+        payParam.setPayAmount(MathUtil.mul(price, 100).intValue());
+        payParam.setNotifyUrl(couponUrl);
+        payParam.setCouponRecordId(payCouponDto.getCouponRecordId());
+        log.info("【购买价值优惠券银联线上支付】>>>>>>>>>>>RecordId:" + payCouponDto.getCouponRecordId());
+        return toPayCoupon(payParam, headers);
+    }
+
+    @Override
+    public ResponseJson<PayCouponDto> getCouponRecord(PayCouponDto payCouponDto, HttpHeaders headers) {
+        //个人机构返回状态码-1  不是医美 -2
+        if (49 == payCouponDto.getCouponId()) {
+            //正式id49优惠券 普通机构和非医美机构无法购买
+            //先判断是否是普通机构，是就打回
+            Integer userIdentity = baseMapper.getIdentityByUserId(payCouponDto.getUserId());
+            if (userIdentity != null && 4 == userIdentity) {
+                return ResponseJson.error(-1, "仅供医美机构购买！", null);
+            }
+            Integer clubType = payOrderMapper.findClubType(payCouponDto.getUserId());
+            //为空或者不等于1    医美=1和生美=2
+            if (null == clubType || 1 != clubType) {
+                return ResponseJson.error(-2, "仅供医美机构购买！", null);
+            }
+        }
+        CouponRecordPo cr = new CouponRecordPo();
+        cr.setCouponId(payCouponDto.getCouponId());
+        cr.setUserId(payCouponDto.getUserId());
+        payOrderMapper.insertCouponRecord(cr);
+        payCouponDto.setCouponRecordId(cr.getId());
+        return ResponseJson.success(payCouponDto);
+    }
+
+    @Override
+    public ResponseJson couponCheck(Integer recordId) {
+        Integer status = payOrderMapper.findPayStatus(recordId);
+        if (null != status && 1 == status) {
+            return ResponseJson.success("支付成功", null);
+        }
+        return ResponseJson.error("支付失败", null);
+    }
+
+    @Override
+    public ResponseJson vipCheck(Integer recordId) {
+        // 获取会员套餐记录
+        VipRecordBo record = payOrderMapper.getVipPackageRecord(recordId);
+        if (null != record.getPayStatus() && 1 == record.getPayStatus()) {
+            return ResponseJson.success("支付成功！", null);
+        }
+        return ResponseJson.error("支付失败", null);
+    }
+
+
+    private ResponseJson<JSONObject> toPayCoupon(PayParamBo payParam, HttpHeaders headers) {
+        // 定义支付请求结果
+        JSONObject result = null;
+        try {
+            // 时间戳
+            long time = System.currentTimeMillis() / 1000;
+            // 设置支付基础参数
+            JSONObject json = getPayJsonObject(payParam, headers, time);
+            // 支付环境
+            String environment = "";
+            if (payParam.getNotifyUrl().contains("18002")) {
+                environment = "DEV";
+            } else if (payParam.getNotifyUrl().contains("core-b")) {
+                environment = "BETA";
+            }
+            // 商户订单号
+            String orderId = payParam.getUserId() + "C" + payParam.getCouponId() + "R" + payParam.getCouponRecordId() + "T" + time + environment;
+            json.put("orderId", orderId);
+            //商品名称
+            String product = "采美订单" + orderId;
+            json.put("product", product);
+            //支付类型
+            String payType = PayUtil.getPayTypeId(payParam.getPayType(), payParam.getUserType());
+            String attach = payParam.getCouponId() + "," + payParam.getUserId() + "," + payParam.getCouponRecordId() + "," + payType + "," + payParam.getSource();
+            json.put("attach", attach);
+            // 价值优惠券默认公账专票，彩美信息
+            List<Map<String, String>> list = new ArrayList<>();
+            Map<String, String> map = new HashMap<>(3);
+            map.put("subUserNo", PayUtil.publicAccountNo);
+            // 1按比例分账
+            map.put("splitBillType", "1");
+            // 1比例值总额
+            map.put("splitBillValue", "1");
+            list.add(map);
+            String splitBillDetail = JSONObject.toJSONString(list);
+            json.put("splitBillDetail", splitBillDetail);
+            String sign = PayUtil.getPaySign(json, PayUtil.merKey);
+            json.put("sign", sign);
+            log.info("发送参数 json：" + json);
+            // 私钥加密
+            String data = RSAUtil.privateEncrypt(json.toJSONString(), PayUtil.merKey);
+            // 提交
+            result = PayUtil.httpGet("https://platform.mhxxkj.com/paygateway/mbpay/order/v1", PayUtil.merAccount, data);
+        } catch (Exception e) {
+            log.error("错误信息", e);
+            return ResponseJson.error("支付失败！", null);
+        }
+        String code = result.getString("code");
+        if (!"000000".equals(code)) {
+            String msg = result.getString("msg");
+            log.info("第三方支付失败>>>>>>>msg:" + msg);
+            return ResponseJson.error(msg, null);
+        }
+        // 保存购买优惠券分账参数
+        JSONObject data = result.getJSONObject("data");
+        SplitAccountPo splitAccount = new SplitAccountPo();
+        splitAccount.setCouponRecordId(payParam.getCouponRecordId());
+        // 优惠券 公账-专票
+        splitAccount.setType(1);
+        // 待分账总金额
+        double splitAmount = MathUtil.div(payParam.getPayAmount(), 100).doubleValue();
+        // 总手续费
+        double procedureFee;
+        if ("UNIONPAY".equals(payParam.getPayWay())) {
+            procedureFee = 8.00;
+        } else {
+            //手续费
+            procedureFee = MathUtil.mul(splitAmount, 0.0038, 2).doubleValue();
+            if (MathUtil.compare(procedureFee, 0) == 0) {
+                procedureFee = 0.01;
+            }
+        }
+        splitAmount = MathUtil.sub(splitAmount, procedureFee).doubleValue();
+        splitAccount.setSplitAccount(splitAmount);
+        splitAccount.setMbOrderId(data.getString("mbOrderId"));
+        splitAccount.setOrderRequestNo(data.getString("orderId"));
+        splitAccount.setPayStatus(0);
+        // 保存分账详情
+        payOrderMapper.insertSplitAccount(splitAccount);
+        log.info("【购买优惠券支付成功！】>>>>>>>>>>>couponRecordId:" + payParam.getCouponRecordId() + "，data:" + data.toJSONString());
+        return ResponseJson.success(result);
+    }
+
+    @Override
+    public String couponCallback(String data) throws NoSuchAlgorithmException, InvalidKeySpecException {
+        log.info("******************** 购买优惠券异步回调 start *******************");
+        // 公钥解密
+        JSONObject json = PayUtil.publicKeyDecrypt(data, PayUtil.publicKey);
+        log.info("【购买优惠券异步回调】>>>>>>>>>>>公钥解密：" + json);
+        // 公钥验签
+        String signaa = json.getString("sign");
+        json.remove("sign");
+        String signbb = PayUtil.getPaySign(json, PayUtil.publicKey);
+        if (!signaa.equals(signbb)) {
+            return "验签失败";
+        }
+        // 订单状态
+        String orderStatus = json.getString("orderStatus");
+        // 平台唯一流水号
+        String mbOrderId = json.getString("mbOrderId");
+        // 商户唯一订单号
+        String orderRequestNo = json.getString("orderId");
+        // 金额，以元为单位
+        Double amount = json.getDouble("amount");
+        String payFormData = json.toJSONString();
+        log.info("【购买优惠券异步回调】>>>>>>>>>>>支付订单状态：" + orderStatus);
+        if ("FAILED".equals(orderStatus)) {
+            return "支付失败";
+        }
+        log.info("【购买优惠券异步回调】>>>>>>>>>>>>>>本次支付金额：" + amount);
+        // 附加数据，支付时若有传输则原样返回(vipId,userId,recordId,payType)，下单时为空，则不返回该数据
+        String attach = json.getString("attach");
+        String[] split = attach.split(",");
+        int couponId = 0;
+        int userId = 0;
+        int recordId = 0;
+        int payType = 0;
+        int source = 0;
+        try {
+            // 优惠券Id
+            couponId = Integer.parseInt(split[0]);
+            // 用户Id
+            userId = Integer.parseInt(split[1]);
+            // 购买历史记录Id
+            recordId = Integer.parseInt(split[2]);
+            // 支付方式
+            payType = Integer.parseInt(split[3]);
+            //购买渠道
+            source = Integer.parseInt(split[4]);
+        } catch (NumberFormatException e) {
+            log.info("【购买优惠券异步回调】>>>>>>>>>>>>>>获取回调参数解析失败！");
+        }
+        //cm_coupon_club数据库修改
+        CouponClubPo couponClubPo = new CouponClubPo();
+        couponClubPo.setSource(source);
+        couponClubPo.setUserId(userId);
+        couponClubPo.setCouponId(couponId);
+        couponClubPo.setStatus("1");
+        couponClubPo.setDelFlag("0");
+        couponClubPo.setCreateDate(new Date());
+        orderClubMapper.insertCouponClub(couponClubPo);
+        // 改历史记录支付状态
+        payOrderMapper.updateCouponRecord(recordId);
+        Date date = new Date();
+        String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+        // 保存收款记录
+        DiscernReceiptPo discernReceipt = new DiscernReceiptPo();
+        discernReceipt.setPayWay(1);
+        discernReceipt.setPayType(payType);
+        discernReceipt.setReceiptType(8);
+        discernReceipt.setReceiptStatus(3);
+        discernReceipt.setReceiptAmount(amount);
+        discernReceipt.setConfirmType(4);
+        discernReceipt.setRePayFlag(1);
+        discernReceipt.setFormData(payFormData);
+        discernReceipt.setReceiptDate(curDateStr);
+        discernReceipt.setConfirmDate(curDateStr);
+        discernReceipt.setReviewDate(curDateStr);
+        discernReceipt.setUpdateDate(curDateStr);
+        discernReceipt.setDelFlag(0);
+        // 保存 收款记录
+        baseMapper.insertDiscernReceipt(discernReceipt);
+        log.info("【购买优惠券异步回调】>>>>>>>>>>>>>>保存识别款项(insert[cm_discern_receipt])id：" + discernReceipt.getId() + "，couponRecordId：" + recordId);
+        // 收款项和订单关系表
+        OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
+        relation.setReceiptId(discernReceipt.getId());
+        relation.setCouponRecordId(recordId);
+        relation.setAssociateAmount(amount);
+        relation.setMbOrderId(mbOrderId);
+        relation.setOrderRequestNo(orderRequestNo);
+        relation.setSplitStatus(1);
+        relation.setRelationType(6);
+        relation.setDelFlag(0);
+        // 保存 收款项和订单关系
+        baseMapper.insertOrderReceiptRelation(relation);
+        log.info("【购买优惠券异步回调】>>>>>>>>>>>收款项和购买历史关系(insert[cm_receipt_order_relation])id：" + relation.getId() + "，couponRecordId：" + recordId);
+        //修改分账付款状态
+        payOrderMapper.updateSplitAccountByPay(mbOrderId);
+        return "SUCCESS";
+    }
+
     /**
      * 开通认证通会员-微信线上支付
      *

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -1273,7 +1273,8 @@ public class PayOrderServiceImpl implements PayOrderService {
             splitAccount.setSplitAccount(splitAmount);
             splitAccount.setProductType(3);
             splitAccount.setType(5);
-            splitAccount.setSubUserNo(PayUtil.brokerage);
+            //todo 暂时切信息
+            splitAccount.setSubUserNo(PayUtil.publicAccountNo);
             log.info("佣金分账参数------------->" + splitAccount);
             list.add(splitAccount);
         }

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -909,7 +909,7 @@ public class SubmitServiceImpl implements SubmitService {
         Double couponAmount = 0d;
         CouponVo coupon = null;
         if (null != orderParamBo.getClubCouponId() && orderParamBo.getClubCouponId() > 0) {
-            coupon = orderClubMapper.getClubCouponById(orderParamBo.getClubCouponId());
+            coupon = orderClubMapper.getClubCouponById(orderParamBo.getClubCouponId(),orderParamBo.getUserId());
             if (null == coupon) {
                 // 设置手动回滚事务
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -1540,6 +1540,7 @@ public class SubmitServiceImpl implements SubmitService {
         OrderPo mainOrder = new OrderPo();
         //协销订金订单默认不可见
         mainOrder.setOrderSeen(2);
+        mainOrder.setSpId(rechargeDto.getServiceProviderId());
         // 订单来源
         mainOrder.setOrderSource(6);
         // 订单号

src/main/resources/mapper/BaseMapper.xml

@@ -264,9 +264,9 @@
     </insert>
     <insert id="insertOrderReceiptRelation" keyColumn="id" keyProperty="id"
             parameterType="com.caimei365.order.model.po.OrderReceiptRelationPo" useGeneratedKeys="true">
-        INSERT INTO cm_receipt_order_relation (relationType, receiptId, associateAmount, orderId, vipRecordId,authVipRecordId, delFlag,
+        INSERT INTO cm_receipt_order_relation (relationType, receiptId, associateAmount, orderId, couponRecordId, vipRecordId,authVipRecordId, delFlag,
                                                mbOrderId, orderRequestNo, splitStatus, productId)
-        VALUES (#{relationType}, #{receiptId}, #{associateAmount}, #{orderId}, #{vipRecordId}, #{authVipRecordId}, #{delFlag}, #{mbOrderId},
+        VALUES (#{relationType}, #{receiptId}, #{associateAmount}, #{orderId},#{couponRecordId}, #{vipRecordId}, #{authVipRecordId}, #{delFlag}, #{mbOrderId},
                 #{orderRequestNo}, #{splitStatus}, #{productId})
     </insert>
     <insert id="insertBeansHistory" parameterType="com.caimei365.order.model.po.UserBeansHistoryPo">

src/main/resources/mapper/OrderClubMapper.xml

@@ -507,12 +507,13 @@
         cc.categoryType
         FROM cm_coupon_club a
         LEFT JOIN cm_coupon cc ON a.couponId = cc.id
-        WHERE cc.delFlag = 0
+        WHERE if(cc.moneyCouponFlag=2,cc.delFlag = 0,cc.id>0)
         AND a.delFlag = 0
         AND a.id = #{clubCouponId}
         AND a.status = 1
-        AND NOW() BETWEEN cc.startDate
-        AND cc.endDate
+        AND NOW() <![CDATA[ > ]]> startDate
+        AND NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,date_add(if((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and (SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,(SELECT registerTime FROM user WHERE userID = #{userId}),startDate),
+            interval receivePeriod day))
         AND cc.status != 2
     </select>
     <select id="getOrderCouponRecord" resultType="com.caimei365.order.model.po.CouponOrderRecordPo">
@@ -530,4 +531,7 @@
         WHERE userId = #{userId}
         ORDER BY orderID DESC limit 1
     </select>
+    <select id="findUserId" resultType="java.lang.Integer">
+        select userId from cm_order where orderID = #{orderId}
+    </select>
 </mapper>

src/main/resources/mapper/OrderCommonMapper.xml

@@ -404,13 +404,16 @@
             id AS couponId,
             couponAmount,
             touchPrice,
+            moneyCouponPrice,
+            moneyCouponFlag,
+            moneyCouponType,
             <if test="userId == null || userId == 0">
                 startDate,
                 endDate,
             </if>
             <if test="userId >0">
                 if(#{registerTime} <![CDATA[ > ]]> startDate,#{registerTime},startDate) as startDate,
-                if(receiveFlag=1,endDate,date_add(if(#{registerTime} <![CDATA[ > ]]> startDate,#{registerTime},startDate),interval receivePeriod day)) as endDate,
+                if(receiveFlag=1,endDate,date_add(if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime} <![CDATA[ < ]]> endDate,#{registerTime},startDate),interval receivePeriod day)) as endDate,
             </if>
             couponType,
             userId,
@@ -427,12 +430,12 @@
         <if test="userId > 0">
             AND id NOT IN(SELECT couponId FROM cm_coupon_club WHERE userId = #{userId})
             AND (couponType IN (0,1,3)
-            OR couponType = 2 AND userId = #{userId}
+            OR (couponType = 2 AND userId = #{userId})
             OR ((SELECT registerTime FROM USER WHERE userID = #{userId}) <![CDATA[ >= ]]> startDate
             AND couponType = 4))
             and NOW() <![CDATA[ > ]]> startDate
             and NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,
-            date_add(if(#{registerTime} <![CDATA[ > ]]> startDate,#{registerTime},startDate),
+            date_add(if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime} <![CDATA[ < ]]> endDate,#{registerTime},startDate),
             interval receivePeriod day))
         </if>
         ORDER BY createDate DESC
@@ -443,6 +446,9 @@
             cc.id AS couponId,
             cc.couponAmount,
             cc.touchPrice,
+            cc.moneyCouponFlag,
+            cc.moneyCouponPrice,
+            cc.moneyCouponType,
             if(cc.vipFlag = 1,cc.startDate,a.createDate) as startDate,
             if(cc.vipFlag = 1,cc.endDate,date_add(a.createDate,interval cc.usePeriod day)) as endDate,
             cc.couponType,

src/main/resources/mapper/PayOrderMapper.xml

@@ -39,9 +39,9 @@
                 #{generateTime}, #{effectiveTime}, #{payStatus}, #{payType}, #{delFlag})
     </insert>
     <insert id="insertSplitAccount" keyColumn="id" keyProperty="id"  parameterType="com.caimei365.order.model.po.SplitAccountPo">
-        INSERT INTO cm_split_account (orderId, productId, orderProductId, shopId, vipRecordId, authVipRecordId, type, subUserNo, splitAccount,
+        INSERT INTO cm_split_account (orderId, productId, orderProductId, shopId, couponRecordId,vipRecordId, authVipRecordId, type, subUserNo, splitAccount,
                                         mbOrderId, orderRequestNo,payStatus, productType, splitTime)
-        VALUES (#{orderId}, #{productId}, #{orderProductId}, #{shopId},#{vipRecordId},#{authVipRecordId}, #{type}, #{subUserNo}, #{splitAccount},
+        VALUES (#{orderId}, #{productId}, #{orderProductId}, #{shopId},#{couponRecordId},#{vipRecordId}, #{authVipRecordId}, #{type}, #{subUserNo}, #{splitAccount},
                 #{mbOrderId}, #{orderRequestNo}, #{payStatus}, #{productType}, NOW());
     </insert>
     <insert id="insertPayShop" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.po.PayShopPo">
@@ -64,6 +64,9 @@
         INSERT INTO auth_vip_user(authUserId, beginTime, endTime, delFlag, updateTime)
         VALUES (#{userId}, #{beginTime}, #{endTime}, #{delFlag}, #{updateTime})
     </insert>
+    <insert id="insertCouponRecord" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.po.CouponRecordPo" useGeneratedKeys="true">
+        INSERT INTO cm_coupon_buyrecord (couponId, userId) VALUES (#{couponId},#{userId})
+    </insert>
     <update id="updateUserVipInfo">
         UPDATE cm_svip_user set userId=#{userId}, beginTime=#{beginTime}, endTime=#{endTime}, delFlag=#{delFlag}, updateTime=#{updateTime}
         WHERE userId = #{userId}
@@ -115,6 +118,11 @@
         ableUserMoney = #{ableUserMoney}
         WHERE userID = #{userId}
     </update>
+    <update id="updateCouponRecord">
+        update cm_coupon_buyrecord
+        set payStatus = 1
+        where id = #{recordId}
+    </update>
     <update id="updateAuthVipInfo">
         UPDATE auth_vip_user set authUserId=#{userId}, beginTime=#{beginTime}, endTime=#{endTime}, delFlag=#{delFlag}, updateTime=#{updateTime}
         WHERE authUserId = #{userId}
@@ -302,6 +310,15 @@
           AND cubr.balanceType = 10
           AND cror.associateAmount > 0.01
     </select>
+    <select id="getCouponPrice" resultType="java.lang.Double">
+        select moneyCouponPrice from cm_coupon where id = #{couponId}
+    </select>
+    <select id="findPayStatus" resultType="java.lang.Integer">
+        select payStatus from cm_coupon_buyrecord where id = #{recordId}
+    </select>
+    <select id="findClubType" resultType="java.lang.Integer">
+        SELECT firstClubType FROM club WHERE userId = #{userId}
+    </select>
     <select id="getAuthVipRecord" resultType="com.caimei365.order.model.bo.VipRecordBo">
         SELECT id, authUserId as userId, packageId, price, payStatus FROM auth_vip_history WHERE id = #{vipRecordId};
         </select>