Merge remote-tracking branch 'origin/feature/getAndJoin-刘鹏飞'

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

@@ -2872,6 +2872,12 @@ public class OrderSdkAdapter {
         // todo 订单行扩展字段商品组
         extInfo.setProductGroupList(product.getProductGroupList());
 
+        // 是否需要积分，农工商发送积分需要判断商品是否是送积分的商品
+        // 发积分的操作移到消费者，所以这个值需要保存下来
+        if(product.getNeedBonus() != null){
+            extInfo.setNeedBonus(product.getNeedBonus());
+        }
+
         orderItemCreateReq.setExtInfo(JSONObject.toJSONString(extInfo));
 
         // 拼单加购人信息 add by miaohui 2020.10.12 start

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -213,4 +213,9 @@ public class CreateOrderProductRequest extends BaseConfig {
      * 拼单买一赠一标记赠品是那个商品送的 originalGoodsUid
      */
     private String originalGoodsUid;
+
+    /**
+     * 是否需要积分
+     */
+    private Boolean needBonus;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -82,4 +82,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
      * 拼单买一赠一标记赠品是那个商品送的 originalGoodsUid
      */
     private String originalGoodsUid;
+
+    /**
+     * 是否需要积分
+     */
+    private Boolean needBonus;
 }