update:付款暂存

fengliang
1 parent 87806423
Showing 6 changed files with 92 additions and 99 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/ShopCartMessage.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartMessageServiceImpl.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/resolver/WeChatPayRpcResolver.java
@@ -746,21 +746,21 @@ public class OrderController {
     }
-    /**
-     * 查询是否可以微信支付
-     * @param order
-     * @return
-     */
-    @RequestMapping(value = "/checkWechatPayEnable",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
-    public Message<Boolean> getOneOrderDetail(@RequestBody OrderDto order){
-        try{
-            Boolean enable = orderService.checkWechatPayEnable(order.getMarketId(),order.getShopId());
-            return Message.success(enable);
-        }catch (PlatformServiceException pe) {
-            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
-            return Message.success(false);
-        }
-    }
+//    /**
+//     * 查询是否可以微信支付
+//     * @param order
+//     * @return
+//     */
+//    @RequestMapping(value = "/checkWechatPayEnable",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
+//    public Message<Boolean> getOneOrderDetail(@RequestBody OrderDto order){
+//        try{
+//            Boolean enable = orderService.checkWechatPayEnable(order.getMarketId(),order.getShopId());
+//            return Message.success(enable);
+//        }catch (PlatformServiceException pe) {
+//            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
+//            return Message.success(false);
+//        }
+//    }
     /**
      * 查询核销状态
@@ -298,12 +298,4 @@ public class ShopCartMessage extends BaseDo implements Serializable {
     public void setCheckFlag(Integer checkFlag) {
         this.checkFlag = checkFlag;
     }
-
-    public Long getShopCartId() {
-        return shopCartId;
-    }
-
-    public void setShopCartId(Long shopCartId) {
-        this.shopCartId = shopCartId;
-    }
 }
 \ No newline at end of file
@@ -244,13 +244,13 @@ public interface OrderService {
      */
     OrderPaymentCheckDto checkPayState(String paymentId,Long marketId);
-    /**
-     * 检测商户是否可以进行微信支付
-     * @param marketId
-     * @param shopId
-     * @return
-     */
-    Boolean checkWechatPayEnable(Long marketId, Long shopId);
+//    /**
+//     * 检测商户是否可以进行微信支付
+//     * @param marketId
+//     * @param shopId
+//     * @return
+//     */
+//    Boolean checkWechatPayEnable(Long marketId, Long shopId);
     /**
      * 获取订单状态
@@ -989,18 +989,18 @@ public class OrderServiceImpl implements OrderService {
         return orderPaymentCheckDto;
     }
-    @Override
-    public Boolean checkWechatPayEnable(Long marketId, Long shopId) {
-        if(weChatPayRpcResolver.checkWeChatPayChannel(new WeChatPayFunctionDto(null,null,marketId))){
-            ShopCo shopCo = new ShopCo();
-            shopCo.setId(shopId);
-            ShopVo shopVo = shopService.detail(shopCo);
-            if(StringUtils.isNotBlank(shopVo.getWxMerchantNumber())){
-                return true;
-            }
-        }
-        return false;
-    }
+//    @Override
+//    public Boolean checkWechatPayEnable(Long marketId, Long shopId) {
+//        if(weChatPayRpcResolver.checkWeChatPayChannel(new WeChatPayFunctionDto(null,null,marketId))){
+//            ShopCo shopCo = new ShopCo();
+//            shopCo.setId(shopId);
+//            ShopVo shopVo = shopService.detail(shopCo);
+//            if(StringUtils.isNotBlank(shopVo.getWxMerchantNumber())){
+//                return true;
+//            }
+//        }
+//        return false;
+//    }
     @Override
     public OrderDto checkOrderState(String code) {
@@ -137,6 +137,7 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
         AssertUtils.isTrue(shopCartMessageOld.getType().equals(shopCartMessageDto.getType()), "历史购物车商品信息与新增购物车商品信息卖货方式不同");
         shopCartMessageDto.setId(shopCartMessageOld.getId());
         shopCartMessageDto.setVersion(shopCartMessageOld.getVersion());
+        shopCartMessageDto.setCheckFlag(shopCartMessageOld.getCheckFlag());
         //如果是处理离线缓存数据，bo=true,总重量做覆盖，不是处理离线数据，总重量做增量
         if (bo) {
             //如果缓存时间在更新之前之前，说明缓存数据不是最新数据，则不进行更新操作
@@ -34,10 +34,10 @@ public class WeChatPayRpcResolver {
     public static final String PAY_STATE_CHECK ="wechat.payment.service:state";
     /** 微信支付关闭订单 */
     public static final String PAY_STATE_CLOSE ="wechat.payment.service:close";
-    /** 微信支付历史交易查询 */
-    public static final String PAY_STATE_INFO ="wechat.payment.service:statement";
-    /** 微信支付退款 */
-    public static final String REFUND_STATE_INFO ="wechat.payment.service:refund";
+//    /** 微信支付历史交易查询 */
+//    public static final String PAY_STATE_INFO ="wechat.payment.service:statement";
+//    /** 微信支付退款 */
+//    public static final String REFUND_STATE_INFO ="wechat.payment.service:refund";
     @Autowired
     private PayRpc payRpc;
@@ -102,61 +102,61 @@ public class WeChatPayRpcResolver {
         }
     }
-    /**
-     * 微信流水查询
-     * @param weChatPayFunctionDto
-     * @return
-     */
-    public Message<WeChatPayInfoDto>  weChatPayInfo(WeChatPayFunctionDto weChatPayFunctionDto){
-        //组装headers
-        HttpHeaders prepareHeaders = creatHeader(weChatPayFunctionDto.getMarketId().toString(), PAY_STATE_INFO);
-        Message<WeChatPayInfoDto> cancelJsonObject = payRpc.wechatPayInfo(weChatPayFunctionDto, prepareHeaders);
-        if(!cancelJsonObject.getCode().equals(200)){
-            log.info("微信流水查询入参{},请求体头部为{},请求结果为{}",weChatPayFunctionDto,prepareHeaders,cancelJsonObject);
-            throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "微信流水查询失败：" + cancelJsonObject.getMessage());
-        }else {
-            return cancelJsonObject;
-        }
-    }
+//    /**
+//     * 微信流水查询
+//     * @param weChatPayFunctionDto
+//     * @return
+//     */
+//    public Message<WeChatPayInfoDto>  weChatPayInfo(WeChatPayFunctionDto weChatPayFunctionDto){
+//        //组装headers
+//        HttpHeaders prepareHeaders = creatHeader(weChatPayFunctionDto.getMarketId().toString(), PAY_STATE_INFO);
+//        Message<WeChatPayInfoDto> cancelJsonObject = payRpc.wechatPayInfo(weChatPayFunctionDto, prepareHeaders);
+//        if(!cancelJsonObject.getCode().equals(200)){
+//            log.info("微信流水查询入参{},请求体头部为{},请求结果为{}",weChatPayFunctionDto,prepareHeaders,cancelJsonObject);
+//            throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "微信流水查询失败：" + cancelJsonObject.getMessage());
+//        }else {
+//            return cancelJsonObject;
+//        }
+//    }
-    /**
-     * 查询微信支付通道是否配置
-     * @param weChatPayFunctionDto
-     * @return
-     */
-    public Boolean  checkWeChatPayChannel(WeChatPayFunctionDto weChatPayFunctionDto){
-        //组装headers
-        try {
-            HttpHeaders prepareHeaders = creatHeader(weChatPayFunctionDto.getMarketId().toString(), PAY_STATE_INFO);
-            Message<WeChatPayFunctionBackDto> cancelJsonObject = payRpc.checkWeChatPayChannel(weChatPayFunctionDto, prepareHeaders);
-            if (!cancelJsonObject.getCode().equals(200)) {
-                log.info("微信流水查询入参{},请求体头部为{},请求结果为{}", weChatPayFunctionDto, prepareHeaders, cancelJsonObject);
-                return false;
-            } else {
-                return true;
-            }
-        }catch (Exception e){
-            log.warn("通道查询异常",e);
-            return false;
-        }
-    }
+//    /**
+//     * 查询微信支付通道是否配置
+//     * @param weChatPayFunctionDto
+//     * @return
+//     */
+//    public Boolean  checkWeChatPayChannel(WeChatPayFunctionDto weChatPayFunctionDto){
+//        //组装headers
+//        try {
+//            HttpHeaders prepareHeaders = creatHeader(weChatPayFunctionDto.getMarketId().toString(), PAY_STATE_INFO);
+//            Message<WeChatPayFunctionBackDto> cancelJsonObject = payRpc.checkWeChatPayChannel(weChatPayFunctionDto, prepareHeaders);
+//            if (!cancelJsonObject.getCode().equals(200)) {
+//                log.info("微信流水查询入参{},请求体头部为{},请求结果为{}", weChatPayFunctionDto, prepareHeaders, cancelJsonObject);
+//                return false;
+//            } else {
+//                return true;
+//            }
+//        }catch (Exception e){
+//            log.warn("通道查询异常",e);
+//            return false;
+//        }
+//    }
-    /**
-     * 微信退款
-     * @param weChatPayTradeDto
-     * @return
-     */
-    public Message<EcapWeChatRefundVo>  refund(WeChatPayTradeDto weChatPayTradeDto){
-        //组装headers
-        HttpHeaders prepareHeaders = creatHeader(weChatPayTradeDto.getMarketId().toString(), REFUND_STATE_INFO);
-        Message<EcapWeChatRefundVo> cancelJsonObject = payRpc.refund(weChatPayTradeDto, prepareHeaders);
-        if(!cancelJsonObject.getCode().equals(200)){
-            log.info("微信流水查询入参{},请求体头部为{},请求结果为{}",weChatPayTradeDto,prepareHeaders,cancelJsonObject);
-            throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "微信流水查询失败：" + cancelJsonObject.getMessage());
-        }else {
-            return cancelJsonObject;
-        }
-    }
+//    /**
+//     * 微信退款
+//     * @param weChatPayTradeDto
+//     * @return
+//     */
+//    public Message<EcapWeChatRefundVo>  refund(WeChatPayTradeDto weChatPayTradeDto){
+//        //组装headers
+//        HttpHeaders prepareHeaders = creatHeader(weChatPayTradeDto.getMarketId().toString(), REFUND_STATE_INFO);
+//        Message<EcapWeChatRefundVo> cancelJsonObject = payRpc.refund(weChatPayTradeDto, prepareHeaders);
+//        if(!cancelJsonObject.getCode().equals(200)){
+//            log.info("微信流水查询入参{},请求体头部为{},请求结果为{}",weChatPayTradeDto,prepareHeaders,cancelJsonObject);
+//            throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "微信流水查询失败：" + cancelJsonObject.getMessage());
+//        }else {
+//            return cancelJsonObject;
+//        }
+//    }
     /**
      * 组装headers
      * @param marketId