仓管费

@@ -199,7 +199,6 @@ public class PickAction {
         BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trusteeshipCycle)).
                 multiply(new BigDecimal(pickTotal));
         if ("01".equals(pickType)){//本人自提
-            pickInfo = (OutpropApplyPickInfo)session.getAttribute("pickInfo");
             UserInfo userInfo = (UserInfo)session.getAttribute("USER_INFO");
             model.addAttribute("pickName", userInfo.getClient_id());
             pickInfo.setPickType("0");

@@ -90,7 +90,7 @@ public class PickPayBiz {
 
     public Boolean isValidNotify(Map<String, String> result) {
         if (UnionPayUtil.checkSign(result)) {
-            if (result.get("status").equals(UnionConstants.NOTIFY_PAY_STATUS)) {
+            if (result.get("billStatus").equals(UnionConstants.NOTIFY_PAY_STATUS)) {
                 DefaultTransactionDefinition def = new DefaultTransactionDefinition();
                 def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
                 TransactionStatus status = transactionManager.getTransaction(def);
@@ -105,6 +105,8 @@ public class PickPayBiz {
 
                         OutpropApplyPickInfo pickInfo = JsonUtil.fromJson(result.get("srcReserve"), OutpropApplyPickInfo.class);
                         pickInfo.setClientId(info.getClientId());
+                        pickInfo.setAmount(info.getAmount());
+                        pickInfo.setTrusteeshipCycle(info.getTrusteeshipCycle());
                         if ("0".equals(pickInfo.getPickType()) || "1".equals(pickInfo.getPickType())) {
                             pickBiz.selfPickNew(pickInfo);
                         } else if ("2".equals(pickInfo.getPickType())) {

@@ -41,6 +41,9 @@ public class OutpropApplyPickInfo extends BaseInfo {
     private boolean                merge            = false;                            //是否合并提货单
     private List<OutpropApplyInfo> applyList        = new ArrayList<OutpropApplyInfo>();
 
+    private String amount;
+    private Integer trusteeshipCycle;
+
     public String getPickNo() {
         return pickNo;
     }
@@ -249,4 +252,19 @@ public class OutpropApplyPickInfo extends BaseInfo {
         this.warehouseCode = warehouseCode;
     }
 
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public Integer getTrusteeshipCycle() {
+        return trusteeshipCycle;
+    }
+
+    public void setTrusteeshipCycle(Integer trusteeshipCycle) {
+        this.trusteeshipCycle = trusteeshipCycle;
+    }
 }

@@ -40,7 +40,7 @@ public class UnionConstants {
     /**
      * 银联商务推送支付成功状态的状态码
      */
-    public static final String NOTIFY_PAY_STATUS = "TRADE_SUCCESS";
+    public static final String NOTIFY_PAY_STATUS = "PAID";
 
     public static final String NOTIFY_DOMAIN = "http://zyn.yocung.com";
 

@@ -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
+		PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE
 	</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)
+			PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE)
 		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})
+			#{warehouseCode, jdbcType=VARCHAR}, #{amount, jdbcType=VARCHAR}, #{trusteeshipCycle, jdbcType=NUMERIC})
 	</insert>
 	
 	<!-- 合并提货单 -->