Merge remote-tracking branch 'origin/feature/20210420-华莱士公用分支-张志恒' into…

Merge remote-tracking branch 'origin/feature/20210420-华莱士公用分支-张志恒' into feature/20210420-华莱士公用分支-张志恒

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1161,6 +1161,13 @@ public class OrderSdkAdapter {
             }
         }
         data.setOperator(orderInfoReqs.getOperator());
+        data.setOperateTime(orderInfoReqs.getUpdateTimestamp());
+        if (CollectionUtils.isNotEmpty(orderInfoReqs.getOrderOperationHistoryList())){
+            List<OrderOperationHistoryResp> historyList =  orderInfoReqs.getOrderOperationHistoryList();
+            OrderOperationHistoryResp historyResp = historyList.get(historyList.size()-1);
+            data.setOperator(historyResp.getOperator());
+            data.setOperateTime(historyResp.getUpdateTime());
+        }
         data.setArriveShopTime("");
         data.setCancelReason(orderInfoReqs.getCancelReason());
         data.setRemark(orderInfoReqs.getNote());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -87,6 +87,10 @@ public class QueryOrdersResponse {
              */
             private String operator;
             /**
+             * 操作时间
+             */
+            private Long operateTime;
+            /**
              * 订单原始金额，单位分
              */
             private BigDecimal originalAmount;

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -112,7 +112,7 @@ public class SpellGroupOrderAdapter {
         /**
          * 处理结算信息
          */
-        this.convertOrderSettlementCreateReq(goods.getGoodsId(), goods.getRealAmount(), createSpellGroupOrderDto.getActivityCode(), createOrderRequest);
+        this.convertOrderSettlementCreateReq(goods.getGoodsId(), goods.getRealAmount(),goods.getDiscountAmount(), createSpellGroupOrderDto.getActivityCode(), createOrderRequest);
         /**
          * 处理快递信息
          */
@@ -223,11 +223,12 @@ public class SpellGroupOrderAdapter {
     }
 
     //优惠信息
-    public void convertOrderSettlementCreateReq(String goodId, Long realAmount, String activityCode, CreateOrderRequest createOrderRequest) {
+    public void convertOrderSettlementCreateReq(String goodId, Long realAmount, Long discountAmount,String activityCode, CreateOrderRequest createOrderRequest) {
         OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();
         orderSettlementCreateReq.setProductId(goodId);
         orderSettlementCreateReq.setSettlementType(OrderSettlementType.SPELL_GROUP.getIndex());
         orderSettlementCreateReq.setSettlementAmount(realAmount);
+        orderSettlementCreateReq.setShopDiscountAmount(discountAmount);
         orderSettlementCreateReq.setNumber(1);
         orderSettlementCreateReq.setShopAmount(realAmount);
         orderSettlementCreateReq.setExternalObjectId(activityCode);
@@ -277,8 +278,8 @@ public class SpellGroupOrderAdapter {
         return queryDeliveryTemplateRequest;
     }
 
-    public GroupWorkRefundRequest convertToGroupWorkRefundRequest(String activityCode, String groupId, String orderId, String userId) {
-        return new GroupWorkRefundRequest(activityCode, groupId, orderId, userId);
+    public GroupWorkRefundRequest convertToGroupWorkRefundRequest(String activityCode,String partnerCode,String groupId, String orderId, String userId) {
+        return new GroupWorkRefundRequest(activityCode,partnerCode, groupId, orderId, userId);
     }
 
     /*------------------下方转换返回信息------------------------*/

order-application-service/src/main/java/cn/freemud/entities/dto/promotion/GroupWorkJoinRequest.java

@@ -56,4 +56,9 @@ public class GroupWorkJoinRequest {
 
     private String mobile;
 
+    /**
+     * appId  5.7号促销提出参数需要appId
+     */
+    private String appId;
+
 }

order-application-service/src/main/java/cn/freemud/entities/dto/promotion/GroupWorkRefundRequest.java

@@ -20,6 +20,11 @@ public class GroupWorkRefundRequest {
     private String activityCode;
 
     /**
+     * 商户号
+     */
+    private String partnerCode;
+
+    /**
      * 团号
      */
     private String groupId;

order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java

@@ -60,7 +60,6 @@ public class SpellGroupOrderDataManager {
     @Autowired
     private DeliveryFeiginClient deliveryFeiginClient;
 
-
     @Autowired
     private EcologyAdminApplicationClient ecologyAdminApplicationClient;
 
@@ -145,8 +144,14 @@ public class SpellGroupOrderDataManager {
         return queryDeliveryTemplateResponse;
     }
 
-
-    public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,AssortmentCustomerInfoVo userLoginInfoDto){
+    /**
+     * 拼团订单，支付回调时开团参团
+     * @param orderBean
+     * @param userLoginInfoDto
+     * @param wxappid
+     * @return
+     */
+    public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,AssortmentCustomerInfoVo userLoginInfoDto,String wxappid){
         GroupWorkJoinRequest groupWorkJoinRequest = new GroupWorkJoinRequest();
         QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(0);
         groupWorkJoinRequest.setActivityCode(orderBean.getOrderSettlementDetailList().get(0).getExternalObjectId());
@@ -158,12 +163,20 @@ public class SpellGroupOrderDataManager {
         groupWorkJoinRequest.setUserId(orderBean.getUserId());
         groupWorkJoinRequest.setUserName(orderBean.getUserName());
         groupWorkJoinRequest.setPartnerCode(orderBean.getCompanyId());
+        groupWorkJoinRequest.setAppId(wxappid);
         groupWorkJoinRequest.setMobile(StringUtils.isEmpty(userLoginInfoDto.getMobile()) ? orderBean.getPhone() : userLoginInfoDto.getMobile());
         log.info(JSON.toJSONString(groupWorkJoinRequest));
         GroupWorkJoinResponse groupWorkJoinResponse = promotionDiscountClient.groupWorkJoin(groupWorkJoinRequest);
         return groupWorkJoinResponse;
     }
 
+    /**
+     * 查询团信息
+     * @param groupId
+     * @param partnerId
+     * @param userId
+     * @return
+     */
     public QueryHistoryGroupVO queryHistoryByGroupId(String groupId, String partnerId,String userId){
         QueryGroupHistoryRequest querySpellGroupRequest = new QueryGroupHistoryRequest();
         List<String> groups = new ArrayList<>();
@@ -178,6 +191,14 @@ public class SpellGroupOrderDataManager {
         return queryHistory.getResult().get(0);
     }
 
+    /**
+     * 创建拼团订单，校验团信息
+     * @param groupId
+     * @param userId
+     * @param activityCode
+     * @param partnerId
+     * @return
+     */
     public QuerySpellGroupVoResponse queryByGroupIdNew(String groupId, String userId, String activityCode, String partnerId){
         QuerySpellGroupRequest querySpellGroupRequest = new QuerySpellGroupRequest();
         querySpellGroupRequest.setGroupId(groupId);
@@ -211,7 +232,7 @@ public class SpellGroupOrderDataManager {
      */
     public GroupWorkRefundResponse groupWorkRefund(GroupWorkRefundRequest groupWorkRefundRequest) {
         GroupWorkRefundResponse groupWorkRefundResponse = promotionDiscountClient.groupWorkRefund(groupWorkRefundRequest);
-        if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(groupWorkRefundResponse.getStatusCode()) || groupWorkRefundResponse.getResult() == null) {
+        if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(groupWorkRefundResponse.getStatusCode())) {
             return null;
         }
         return groupWorkRefundResponse;

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

@@ -463,7 +463,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         //拼单调促销开团
         if(OrderMarketType.GROUPB.getIndex() == orderBean.getMarketingType()){
             AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
-            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto);
+            GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto,wxappid);
             if(!ResponseResult.SUCCESS.getCode().equals(groupWorkJoinResponse.getStatusCode()) || groupWorkJoinResponse.getResult() == null){
                 orderRefund(orderBean, groupWorkJoinResponse.getMsg());
                 backOrdersNotifyActivity(orderBean, backOrdersChangeOrderStatusConsumerQueue, backOrdersNotifyActivityExchange);

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

@@ -2120,6 +2120,8 @@ public class OrderServiceImpl implements Orderservice {
 
         // 微商城订单
         if (com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getCode().equalsIgnoreCase(orderBean.getSource())){
+            // 微商城因为没有退款原因选项 所以将用户退款说明用户作为退款原因
+            orderRefundVo.setReason(orderRefundVo.getRemarks());
             // 必须选择退款方式
             if(Objects.isNull(orderRefundVo.getRefundMode()) || RefundModeEnum.getByIndex(orderRefundVo.getRefundMode()) == null){
                 return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "请选择退款方式");
@@ -2223,7 +2225,7 @@ public class OrderServiceImpl implements Orderservice {
                 // 拼团订单主动退款触发通知促销
                 if (Objects.equals(com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getCode(), orderBean.getSource())
                         && Objects.equals(OrderMarketType.GROUPB.getIndex(), orderBean.getMarketingType())) {
-                    GroupWorkRefundRequest groupWorkRefundRequest = spellGroupOrderAdapter.convertToGroupWorkRefundRequest(orderBean.getSpellGroupActivityCode(),orderBean.getSpellGroupCode(),orderBean.getOid(),orderBean.getUserId());
+                    GroupWorkRefundRequest groupWorkRefundRequest = spellGroupOrderAdapter.convertToGroupWorkRefundRequest(orderBean.getSpellGroupActivityCode(),orderBean.getCompanyId(),orderBean.getSpellGroupCode(),orderBean.getOid(),orderBean.getUserId());
                     GroupWorkRefundResponse refundResponse = spellGroupOrderDataManager.groupWorkRefund(groupWorkRefundRequest);
                     if (Objects.isNull(refundResponse) || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, refundResponse.getStatusCode())) {
                         return ResponseUtil.error(ResponseResult.SPELL_GROUP_REFUND_ERROR);
@@ -4206,6 +4208,7 @@ public class OrderServiceImpl implements Orderservice {
         orderRefundVo.setPartnerId(orderBeanList.get(0).getCompanyId());
         orderRefundVo.setStoreId(orderBeanList.get(0).getShopId());
         orderRefundVo.setReason(Optional.ofNullable(RefundReasonEnum.getSpellGroupReasonByIndex(refundVo.getReason())).orElse(RefundReasonEnum.Other).getDesc());
+        orderRefundVo.setRemarks(orderRefundVo.getReason());
         // 拼团失败取消 默认为只退款不退货
         orderRefundVo.setRefundMode(RefundModeEnum.UN_REFUND_GOODS.getIndex());
 
@@ -4350,10 +4353,11 @@ public class OrderServiceImpl implements Orderservice {
                 BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
                 if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
                     log.error("批量取消订单失败  订单号:{}",orderBean.getOid());
+                }else {
+                    fail = false;
+                    // 删除订单 通知活动添加商品库存
+                    backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus());
                 }
-                fail = false;
-                // 删除订单 通知活动添加商品库存
-                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus());
             }catch(Exception e){
                 log.error("批量取消订单异常  订单号:{}",orderBean.getOid(),e);
             }