Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -8,3 +8,4 @@
 | 1.0.5-SNAPSHOT | 综合订单查询新增bizType字段 | 侯书虎   | 2019-12-25 |
 | 1.0.7-SNAPSHOT | 综合订单查询新增bizType字段 | 侯书虎   | 2019-12-25 |
 | 1.0.8-SNAPSHOT | 骑手小费字段 | 张明警  | 2019-12-26 |
+| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |

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

@@ -94,7 +94,7 @@ public class OrderSdkAdapter {
         request.setSettlementAmount(requestVO.getAmount());
         //实际支付现金金额，扣除支付自生优惠，单位分
         request.setActualPayAmount(requestVO.getAmount());
-        request.setOrderClient(requestVO.getOrderClientType() == null ? OrderClientType.SAAS.getIndex() : requestVO.getOrderClientType().getIndex());
+        request.setOrderClient(StringUtils.isEmpty(requestVO.getSource())? OrderClientType.SAAS.getIndex():getNewOrderClient(requestVO.getSource()));
         //订单业务类型 1:普通订单 2:虚拟订单
         request.setBizType(1);
         request.setNote(requestVO.getRemark());
@@ -287,6 +287,7 @@ public class OrderSdkAdapter {
                     orderSettlementCreateReq.setSettlementAmount(accountRequest.getPrice());
                     //是否线上 false:不是 true:是
                     orderSettlementCreateReq.setIsOnline(true);
+                    orderSettlementCreateReq.setExtInfo(accountRequest.getAddInfo());
 
                     orderSettlementCreateReqList.add(orderSettlementCreateReq);
                 }
@@ -1019,6 +1020,15 @@ public class OrderSdkAdapter {
             case "XY_DISCOUNT":
                 type = 104;
                 break;
+            case "TOTAL_DISCOUNT":
+                type=205;
+                break;
+            case "ONLINE_PAY":
+                type=218;
+                break;
+            case "OFFLINE_PAY":
+                type=219;
+                break;
             default:
                 break;
         }
@@ -1692,6 +1702,8 @@ public class OrderSdkAdapter {
             case 104:
                 newOrderAccountType = OldOrderAccountType.XY_DISCOUNT.getCode();
                 break;
+            case 205:
+                newOrderAccountType=OldOrderAccountType.TOTAL_DISCOUNT.getCode();
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -33,7 +33,8 @@ public enum OldOrderAccountType {
     CARD_ORIGINAL_AMOUNT(25, "会员卡原价", "CARD_ORIGINAL_AMOUNT"),
     SET_MEAL(211, "套餐商品优惠", "SET_MEAL"),
     CARD_DISCOUNT_AMOUNT(26, "会员卡优惠金额", "CARD_DISCOUNT_AMOUNT"),
-    XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT");
+    XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT"),
+    TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT");
     private Integer code;
 
     private String desc;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -32,7 +32,10 @@ public enum QueryOrderAccountType {
     CARD_ORIGINAL_AMOUNT("CARD_ORIGINAL_AMOUNT", "会员卡原价"),
     SET_MEAL("SET_MEAL", "套餐商品优惠"),
     CARD_DISCOUNT_AMOUNT("CARD_DISCOUNT_AMOUNT", "会员卡优惠金额"),
-    XY_DISCOUNT("XY_DISCOUNT", "x件y折");
+    XY_DISCOUNT("XY_DISCOUNT", "x件y折"),
+    TOTAL_DISCOUNT("TOTAL_DISCOUNT", "优惠总金额"),
+    ONLINE_PAY("ONLINE_PAY", "线上支付"),
+    OFFLINE_PAY("OFFLINE_PAY", "线下支付");
     private String code;
 
     private String desc;

call-back-service/pom.xml

@@ -129,7 +129,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-dynamic-queue</artifactId>
-            <version>1.1.RELEASE</version>
+            <version>1.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.0.8-SNAPSHOT</version>
+            <version>1.1.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -572,9 +572,10 @@ public class OrderAdapter {
         if (userDeliveryInfoDto != null) {
             deliveryAmount = getUserRealDeliveryAmount(userDeliveryInfoDto.getStoreDeliveryInfoDto(), userDeliveryInfoDto.getUserLongitude(), userDeliveryInfoDto.getUserLatitude());
         }
+        Long cardDiscountAmount = shoppingCartGoodsDto.getCardDiscountAmount() != null ? shoppingCartGoodsDto.getCardDiscountAmount() : 0L;
         Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
         productOrderInfo.setAmount(shoppingCartGoodsDto.getTotalAmount() + deliveryAmount + packageAmount
-                - shoppingCartGoodsDto.getCardOriginalAmount() + shoppingCartGoodsDto.getCardDiscountAmount());
+                - shoppingCartGoodsDto.getCardOriginalAmount() + cardDiscountAmount);
         // 解析购物车信息
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartGoodsDto.getProducts();
         List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos();

ordercenter-sdk/readme.md

@@ -4,4 +4,5 @@
 | ------------ | ---------------- | ------ | ---------- |
 | 1.0.0-SNAPSHOT | 订单接口初次封装 | wuping | 2019-04-03 |
 | 1.0.2-SNAPSHOT | 创建订单接口新增thirdCategoryId字段 | 侯书虎 | 2019-12-23 |
-/ 1.0.3-SNAPSHOT | 订单日结售后单 | 胡超   | 2019-12-25 |
+| 1.0.3-SNAPSHOT | 订单日结售后单 | 胡超   | 2019-12-25 |
+| 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderSettlementCreateReq.java

@@ -34,6 +34,10 @@ public class OrderSettlementCreateReq {
 
     //备注
     private String note;
+    /**
+     * 拓展字段
+     */
+    private String extInfo;
 
     //优惠覆盖数量
     private Integer number;