Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/entities/vo/PaysuccessNoticeMessage.java

@@ -68,4 +68,9 @@ public class PaysuccessNoticeMessage {
      * 会员规则ID
      */
     private String ruleId;
+
+    /**
+     * 消息来源
+     */
+    private Integer source;
 }

order-application-service/src/main/java/cn/freemud/enums/PaySuccessSource.java

+package cn.freemud.enums;
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: cn.freemud.service.thirdparty SvcClient
+ * @Description: TDO 描述....
+ * @author: 铁牌灵魂工程师
+ * @date: 2020/12/01
+ * @Copyright: www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+public enum PaySuccessSource {
+    INSIDE(1,"内部直接调用"),
+    OUTSIDE(2,"外部回调");
+
+    private Integer source;
+    private String desc;
+
+    PaySuccessSource(Integer source,String desc) {
+        this.source = source;
+        this.desc = desc;
+    }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -478,7 +478,6 @@ public class OrderServiceImpl implements Orderservice {
         }
 
         // 订单支付成功
-        log.info(" paysuccess : {}", var1);
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);
         JSONObject jsonObject2 = JSONObject.parseObject(string2);
@@ -548,6 +547,11 @@ public class OrderServiceImpl implements Orderservice {
         }
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
+        if (message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
+            log.info("调用券码核销==" + message.getTrans_id());
+            verificationCoupon(message.getTrans_id());
+            log.info("调用券码结束=="+ message.getTrans_id());
+        }
         return sendPaySuccessNoticeMessage();
     }
 
@@ -619,14 +623,12 @@ public class OrderServiceImpl implements Orderservice {
         message.setPlatformMchId(newMessage.getPlatformMchId());
         message.setTerminalId(newMessage.getAppId());
         message.setRuleId(newMessage.getRuleId());
+        message.setSource(PaySuccessSource.OUTSIDE.getSource());
         String res = orderAdapterService.paySuccessCallback(message);
         JSONObject jsonObject = JSONObject.parseObject(res);
         if (jsonObject.containsKey("code")) {
             Integer code = (Integer) jsonObject.get("code");
             if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
-                log.info("调用券码核销==" + message.getTrans_id());
-                verificationCoupon(message.getTrans_id());
-                log.info("调用券码结束=="+ message.getTrans_id());
                 return newSendPaySuccessNoticeMessage();
             } else {
                 return newSendPayFaileMessage();
@@ -2390,6 +2392,10 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.success(createOrderResponse);
         } else {
             //如果是商品券支付0元，调用回调接口
+            /**
+             *  - 老的svc卡或是0元订单下单成功直接核销 这里不处理
+             *  - 混合支付纯svc支付 需要直接内部核销 其他支付方式需依靠外部回调
+             */
             PaysuccessNoticeMessage message = new PaysuccessNoticeMessage();
             message.setResult_code(100);
             message.setOut_trade_no(createOrderResponse.getFmId());
@@ -2398,6 +2404,10 @@ public class OrderServiceImpl implements Orderservice {
             message.setOpenid(createPrepayRequestDto.getOpenId());
             message.setPlatform_coupon(0);
             message.setMerchant_coupon(0);
+            message.setSource(PaySuccessSource.INSIDE.getSource());
+            if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayMode())) {
+                message.setSource(PaySuccessSource.OUTSIDE.getSource());
+            }
             orderAdapterService.paySuccessCallback(message);
             return ResponseUtil.success(createOrderResponse);
         }
@@ -2569,7 +2579,8 @@ public class OrderServiceImpl implements Orderservice {
         } catch (Exception e) {
             LogUtil.error("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
             //TODO 邮件告警
-            return null;
+            orderPayResponse = new OrderPayResponse();
+            orderPayResponse.setMsg("getPreOrderPay_error");
         }
         return orderPayResponse;
     }
@@ -3066,6 +3077,7 @@ public class OrderServiceImpl implements Orderservice {
      */
     public OrderPayResponse facePay(String cardCode, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo) {
         FacePayRequestDto request = new FacePayRequestDto();
+        OrderPayResponse orderPayResponse = new OrderPayResponse();
         String partnerId = orderBean.getCompanyId();
         request.setBody(orderBean.getShopName());
         request.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
@@ -3087,16 +3099,17 @@ public class OrderServiceImpl implements Orderservice {
             LogUtil.error("facePay_error", null, null, e);
         }
         if (responseDto == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseDto.getCode()) || responseDto.getData() == null) {
-            return null;
-        }
+            // 1.9.34 预支付失败需要把原因进行记录
+            orderPayResponse.setMsg(Objects.isNull(responseDto) ? "扫脸支付异常" : responseDto.getMessage());
+        } else {
             FacePayResponseDto response = responseDto.getData();
-        OrderPayResponse orderPayResponse = new OrderPayResponse();
             orderPayResponse.setFmId(response.getFmId());
             orderPayResponse.setPayTransId(response.getPayTransId());
             orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
+        }
         return orderPayResponse;
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

@@ -334,7 +334,12 @@ public class CalculationCommonService {
         if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
+        if (calculationGoods!=null) {
+            cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
+        }
+        else {
             cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        }
         if (calculationGoods!=null) {
             cartGoodsDetailDto.setTotalDiscountAmount(calculationGoods.getDiscountAmount().intValue());
             //cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());