bruce

优化

......@@ -114,6 +114,7 @@ public class PickPayBiz {
pickInfo.setClientId(info.getClientId());
pickInfo.setAmount(info.getAmount());
pickInfo.setTrusteeshipCycle(info.getTrusteeshipCycle());
pickInfo.setBillNo(info.getTradeNo());
if ("0".equals(pickInfo.getPickType()) || "1".equals(pickInfo.getPickType())) {
pickBiz.selfPickNew(pickInfo);
} else if ("2".equals(pickInfo.getPickType())) {
......
......@@ -43,6 +43,7 @@ public class OutpropApplyPickInfo extends BaseInfo {
private String amount;
private Integer trusteeshipCycle;
private String billNo;
public String getPickNo() {
return pickNo;
......@@ -267,4 +268,12 @@ public class OutpropApplyPickInfo extends BaseInfo {
public void setTrusteeshipCycle(Integer trusteeshipCycle) {
this.trusteeshipCycle = trusteeshipCycle;
}
public String getBillNo() {
return billNo;
}
public void setBillNo(String billNo) {
this.billNo = billNo;
}
}
......
......@@ -7,19 +7,19 @@
<sql id="outpropapply_pick_field">
PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID,
ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME,
PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE
PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE, BILL_NO
</sql>
<insert id="save" parameterType="OutpropApplyPickInfo">
INSERT INTO HS_ASSET.OUTPROPAPPLY_PICK (PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID,
ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME,
PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE)
PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE, BILL_NO)
VALUES (#{pickNo}, #{clientId}, #{pickType}, #{pickAmount}, #{delegateName, jdbcType=VARCHAR}, #{delegateId, jdbcType=VARCHAR},
#{zhaoonlineId, jdbcType=VARCHAR}, #{insurance}, '0', #{pickDate}, #{express, jdbcType=VARCHAR},
#{expressNo, jdbcType=VARCHAR}, #{createDate}, #{createTime},
#{packageType, jdbcType=VARCHAR}, #{packageFee, jdbcType=NUMERIC},
#{expressPackFee, jdbcType=NUMERIC}, #{amountFee, jdbcType=NUMERIC},
#{warehouseCode, jdbcType=VARCHAR}, #{amount, jdbcType=VARCHAR}, #{trusteeshipCycle, jdbcType=NUMERIC})
#{warehouseCode, jdbcType=VARCHAR}, #{amount, jdbcType=VARCHAR}, #{trusteeshipCycle, jdbcType=NUMERIC}, #{billNo, jdbcType=VARCHAR})
</insert>
<!-- 合并提货单 -->
......