update 按费用类型增加分佣规则

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SubjectChange.java

@@ -55,8 +55,10 @@ public class SubjectChange {
     @ApiModelProperty(value = "原始课程费用")
     private BigDecimal originalCourseFee = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "乐器购买方式")
-    private KitGroupPurchaseTypeEnum kitGroupPurchaseType;
+
+
+    @ApiModelProperty(value = "原始乐器购买方式")
+    private KitGroupPurchaseTypeEnum originalKitGroupPurchaseType;
 
     /**
      * 原始乐器编号
@@ -104,6 +106,9 @@ public class SubjectChange {
     private Goods changeMusicalGoods;
 
 
+    @ApiModelProperty(value = "替换后乐器购买方式")
+    private KitGroupPurchaseTypeEnum kitGroupPurchaseType;
+
     /**
      * 替换乐器价格
      */
@@ -566,4 +571,12 @@ public class SubjectChange {
     public void setOriginalOrderId(Integer originalOrderId) {
         this.originalOrderId = originalOrderId;
     }
+
+    public KitGroupPurchaseTypeEnum getOriginalKitGroupPurchaseType() {
+        return originalKitGroupPurchaseType;
+    }
+
+    public void setOriginalKitGroupPurchaseType(KitGroupPurchaseTypeEnum originalKitGroupPurchaseType) {
+        this.originalKitGroupPurchaseType = originalKitGroupPurchaseType;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/NotifyCallback.java

@@ -214,7 +214,7 @@ public class NotifyCallback implements MQTTCallbackHandler {
         hfMember.setStatus("succeeded");
         hfMember.setMemo(corpMemberObj.getString("audit_desc"));
         if (corpMemberObj.containsKey("audit_state") && corpMemberObj.getString("audit_state").equals("E")) {
-            JSONObject accounts = JSON.parseObject(corpMemberObj.get("settle_accounts").toString());
+            JSONObject accounts = JSON.parseObject(corpMemberObj.getString("settle_accounts"));
             hfMember.setSettleAccountId(accounts.getString("id"));
         }
         notifyCallback.hfMemberDao.update(hfMember);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -234,6 +234,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         BigDecimal goodsMargin = subjectChange.getChangeMusicalPrice().add(subjectChange.getChangeAccessoriesPrice())
                 .subtract(subjectChange.getOriginalMusicalPrice()).subtract(subjectChange.getOriginalAccessoriesPrice());
         subjectChange.setGoodsMargin(goodsMargin);
+        subjectChange.setOriginalKitGroupPurchaseType(studentOriginal.getOriginalKitGroupPurchaseType());
         String goodsIds = "";
         if (subjectChange.getChangeMusical() != null) {
             goodsIds += subjectChange.getChangeMusical() + "";
@@ -372,7 +373,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             if (detail.getType().equals(OrderDetailTypeEnum.COURSE)) {
                 subjectChange.setOriginalCourseFee(detail.getPrice());
             } else if (detail.getType().equals(OrderDetailTypeEnum.MUSICAL)) {
-                subjectChange.setKitGroupPurchaseType(detail.getKitGroupPurchaseType());
+                subjectChange.setOriginalKitGroupPurchaseType(detail.getKitGroupPurchaseType());
                 Integer goodsId = Integer.parseInt(detail.getGoodsIdList());
                 if (!refundSellOrderGoodsIds.contains(goodsId)) {
                     subjectChange.setOriginalMusical(goodsId);

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -23,6 +23,8 @@
         <result column="original_accessories_" property="originalAccessories"/>
         <result column="original_accessories_price_" property="originalAccessoriesPrice"/>
         <result column="original_cost_" property="originalCost"/>
+        <result column="original_kit_group_purchase_type_" property="originalKitGroupPurchaseType"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="kit_group_purchase_type_" property="kitGroupPurchaseType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="change_subject_id_" property="changeSubjectId"/>
@@ -52,7 +54,7 @@
         id_,edu_teacher_id_,student_id_,organ_id_,cooperation_organ_id_,
         music_group_id_,original_order_id_,original_subject_id_,original_course_fee_, original_musical_,
         original_musical_price_,
-        original_accessories_,original_accessories_price_,kit_group_purchase_type_,change_subject_id_,
+        original_accessories_,original_accessories_price_,original_kit_group_purchase_type_,kit_group_purchase_type_,change_subject_id_,
         change_course_fee_, change_musical_,
         original_cost_,change_musical_price_,change_accessories_, change_accessories_price_,change_cost_, goods_margin_,
         course_margin_,cost_margin_,sell_amount_,order_id_,order_no_,trans_no_,
@@ -77,7 +79,7 @@
         insert into subject_change
         (student_id_,edu_teacher_id_,organ_id_,cooperation_organ_id_,music_group_id_,original_order_id_,original_subject_id_,original_course_fee_,
         original_musical_,
-        original_musical_price_,original_accessories_,original_accessories_price_,original_cost_,kit_group_purchase_type_,
+        original_musical_price_,original_accessories_,original_accessories_price_,original_cost_,original_kit_group_purchase_type_,kit_group_purchase_type_,
         change_subject_id_,change_course_fee_, change_musical_, change_musical_price_,
         change_accessories_, change_accessories_price_, change_cost_,goods_margin_,
         course_margin_,cost_margin_,sell_amount_,order_id_,
@@ -87,7 +89,8 @@
         #{originalMusical},
         #{originalMusicalPrice},
         #{originalAccessories},
-        #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{originalAccessoriesPrice},#{originalCost},#{originalKitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{changeSubjectId},#{changeCourseFee}, #{changeMusical},
         #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice},#{changeCost}, #{goodsMargin},
         #{courseMargin},#{costMargin},