订单ERP类型

fs-service/src/main/java/com/fs/his/domain/FsStoreOrder.java

@@ -282,4 +282,7 @@ public class FsStoreOrder extends BaseEntity
 
     //档期标签名称
     private String tagNames;
+
+    //ERP类型：1-聚水潭 2-兔灵
+    private Integer erpType;
 }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -873,6 +873,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         Integer packageSubType = (Integer) packageJson.get("packageSubType");
         Integer productType = (Integer) packageJson.get("productType");
         FsStoreOrder order = new FsStoreOrder();
+        if (fsPackage.getErpType() == null) {
+            order.setErpType(1);
+        } else {
+            order.setErpType(fsPackage.getErpType());
+        }
         //确认订单返回结果
         if (result != null && result.getResp_code().equals("00000000") && (result.getTrans_stat().equals("S") || result.getTrans_stat().equals("P"))) {
             order.setZyyDivAmount(result.getYsyAmount());
@@ -1992,6 +1997,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         Integer packageSubType = (Integer) packageJson.get("packageSubType");
         Integer productType = (Integer) packageJson.get("productType");
         FsStoreOrder order = new FsStoreOrder();
+        if (fsPackage.getErpType() == null) {
+            order.setErpType(1);
+        } else {
+            order.setErpType(fsPackage.getErpType());
+        }
         //获取用户档期标签
         List<String> names = qwExternalContactService.selectTagNameByFsUserId(packageOrder.getUserId());
         order.setTagNames(JSON.toJSONString(names));

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zyyDivAmount"    column="zyy_div_amount"    />
         <result property="zyyHuifuId"    column="zyy_huifu_id"    />
         <result property="tagNames"    column="tag_names"    />
+        <result property="erpType"    column="erp_type"    />
     </resultMap>
 
     <sql id="selectFsStoreOrderVo">
@@ -248,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zyyDivAmount != null">zyy_div_amount,</if>
             <if test="zyyHuifuId != null">zyy_huifu_id,</if>
             <if test="tagNames != null">tag_names,</if>
+            <if test="erpType != null">erp_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="storeId != null">#{storeId},</if>
@@ -341,6 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="divAmount != null">#{divAmount},</if>
             <if test="zyyDivAmount != null">#{zyyDivAmount},</if>
             <if test="tagNames != null">#{tagNames},</if>
+            <if test="erpType != null">#{erpType},</if>
          </trim>
     </insert>
 
@@ -439,6 +442,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="divAmount != null and divAmount != ''">div_amount = #{divAmount},</if>
             <if test="zyyDivAmount != null and zyyDivAmount != ''">zyy_div_amount = #{zyyDivAmount},</if>
             <if test="tagNames != null and tagNames != ''">tag_names = #{tagNames},</if>
+            <if test="erpType != null">erp_type = #{erpType},</if>
         </trim>
         where order_id = #{orderId}
     </update>