Procházet zdrojové kódy

机具表新增秒到费字段

mac před 2 roky
rodič
revize
a5fbdeee90

+ 6 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachine.java

@@ -306,6 +306,12 @@ public class KxsMachine extends Model<KxsMachine> implements Serializable {
     @Schema(description = "机具地址")
     private String devLocation;
 
+    /**
+     * 秒到费
+     */
+    @Schema(description = "秒到费")
+    private BigDecimal secondFee;
+
 
 }
 

+ 1 - 0
kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineMapper.xml

@@ -41,6 +41,7 @@
         <result column="scan_qr_trade" property="scanQrTrade"/>
         <result column="source_pos_sn" property="sourcePosSn"/>
         <result column="dev_location" property="devLocation"/>
+        <result column="second_fee" property="secondFee"/>
     </resultMap>
     <select id="machineStoreList" resultType="com.kxs.product.api.vo.kxsapp.machine.MachineStoreListVO">
         select create_time, pos_sn from kxs_machine

+ 11 - 2
kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMachineServiceImpl.java

@@ -227,7 +227,7 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                     lambda.set(KxsMachine::getPartnerId, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "UpFeeFlag":
-                    Integer up = Integer.valueOf(validFieldDataMap.get(field).toString());
+                    int up = Integer.parseInt(validFieldDataMap.get(field).toString());
                     machine.setUpFeeFlag(up);
                     lambda.set(KxsMachine::getUpFeeFlag, up);
                     //监听到调升费率增加记录
@@ -244,11 +244,20 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                         machineRatio.setUserId(kxsMachine.getUserId());
                         machineRatio.setVersion(1);
                         kxsMachineRatioMapper.insert(machineRatio);
+                        //增加秒到费字段
+                        machine.setSecondFee(new BigDecimal("3"));
+                        lambda.set(KxsMachine::getSecondFee, new BigDecimal("3"));
                     }
                     break;
                 case "DownFeeFlag":
-                    machine.setDownFeeFlag(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    int downFlag = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    machine.setDownFeeFlag(downFlag);
                     lambda.set(KxsMachine::getDownFeeFlag, Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    if(downFlag == 1){
+                        //增加秒到费字段
+                        machine.setSecondFee(new BigDecimal("0"));
+                        lambda.set(KxsMachine::getSecondFee, new BigDecimal("0"));
+                    }
                     break;
                 case "IsSupplement":
                     machine.setIsSupply(Integer.valueOf(validFieldDataMap.get(field).toString()));