zyn / cjs-site

Go to a project
Toggle navigation Toggle navigation pinning
bruce
123c7f49 1 parent d20bb52c

仓管费

Inline Side-by-side
Showing 5 changed files with 25 additions and 6 deletions
...@@ -199,7 +199,6 @@ public class PickAction { ...@@ -199,7 +199,6 @@ public class PickAction {
199 BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trusteeshipCycle)). 199 BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trusteeshipCycle)).
200 multiply(new BigDecimal(pickTotal)); 200 multiply(new BigDecimal(pickTotal));
201 if ("01".equals(pickType)){//本人自提 201 if ("01".equals(pickType)){//本人自提
202 - pickInfo = (OutpropApplyPickInfo)session.getAttribute("pickInfo");
203 UserInfo userInfo = (UserInfo)session.getAttribute("USER_INFO"); 202 UserInfo userInfo = (UserInfo)session.getAttribute("USER_INFO");
204 model.addAttribute("pickName", userInfo.getClient_id()); 203 model.addAttribute("pickName", userInfo.getClient_id());
205 pickInfo.setPickType("0"); 204 pickInfo.setPickType("0");
......
...@@ -90,7 +90,7 @@ public class PickPayBiz { ...@@ -90,7 +90,7 @@ public class PickPayBiz {
90 90
91 public Boolean isValidNotify(Map<String, String> result) { 91 public Boolean isValidNotify(Map<String, String> result) {
92 if (UnionPayUtil.checkSign(result)) { 92 if (UnionPayUtil.checkSign(result)) {
93 - if (result.get("status").equals(UnionConstants.NOTIFY_PAY_STATUS)) { 93 + if (result.get("billStatus").equals(UnionConstants.NOTIFY_PAY_STATUS)) {
94 DefaultTransactionDefinition def = new DefaultTransactionDefinition(); 94 DefaultTransactionDefinition def = new DefaultTransactionDefinition();
95 def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED); 95 def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
96 TransactionStatus status = transactionManager.getTransaction(def); 96 TransactionStatus status = transactionManager.getTransaction(def);
...@@ -105,6 +105,8 @@ public class PickPayBiz { ...@@ -105,6 +105,8 @@ public class PickPayBiz {
105 105
106 OutpropApplyPickInfo pickInfo = JsonUtil.fromJson(result.get("srcReserve"), OutpropApplyPickInfo.class); 106 OutpropApplyPickInfo pickInfo = JsonUtil.fromJson(result.get("srcReserve"), OutpropApplyPickInfo.class);
107 pickInfo.setClientId(info.getClientId()); 107 pickInfo.setClientId(info.getClientId());
108 + pickInfo.setAmount(info.getAmount());
109 + pickInfo.setTrusteeshipCycle(info.getTrusteeshipCycle());
108 if ("0".equals(pickInfo.getPickType()) || "1".equals(pickInfo.getPickType())) { 110 if ("0".equals(pickInfo.getPickType()) || "1".equals(pickInfo.getPickType())) {
109 pickBiz.selfPickNew(pickInfo); 111 pickBiz.selfPickNew(pickInfo);
110 } else if ("2".equals(pickInfo.getPickType())) { 112 } else if ("2".equals(pickInfo.getPickType())) {
......
...@@ -41,6 +41,9 @@ public class OutpropApplyPickInfo extends BaseInfo { ...@@ -41,6 +41,9 @@ public class OutpropApplyPickInfo extends BaseInfo {
41 private boolean merge = false; //是否合并提货单 41 private boolean merge = false; //是否合并提货单
42 private List<OutpropApplyInfo> applyList = new ArrayList<OutpropApplyInfo>(); 42 private List<OutpropApplyInfo> applyList = new ArrayList<OutpropApplyInfo>();
43 43
44 + private String amount;
45 + private Integer trusteeshipCycle;
46 +
44 public String getPickNo() { 47 public String getPickNo() {
45 return pickNo; 48 return pickNo;
46 } 49 }
...@@ -249,4 +252,19 @@ public class OutpropApplyPickInfo extends BaseInfo { ...@@ -249,4 +252,19 @@ public class OutpropApplyPickInfo extends BaseInfo {
249 this.warehouseCode = warehouseCode; 252 this.warehouseCode = warehouseCode;
250 } 253 }
251 254
255 + public String getAmount() {
256 + return amount;
257 + }
258 +
259 + public void setAmount(String amount) {
260 + this.amount = amount;
261 + }
262 +
263 + public Integer getTrusteeshipCycle() {
264 + return trusteeshipCycle;
265 + }
266 +
267 + public void setTrusteeshipCycle(Integer trusteeshipCycle) {
268 + this.trusteeshipCycle = trusteeshipCycle;
269 + }
252 } 270 }
......
...@@ -40,7 +40,7 @@ public class UnionConstants { ...@@ -40,7 +40,7 @@ public class UnionConstants {
40 /** 40 /**
41 * 银联商务推送支付成功状态的状态码 41 * 银联商务推送支付成功状态的状态码
42 */ 42 */
43 - public static final String NOTIFY_PAY_STATUS = "TRADE_SUCCESS"; 43 + public static final String NOTIFY_PAY_STATUS = "PAID";
44 44
45 public static final String NOTIFY_DOMAIN = "http://zyn.yocung.com"; 45 public static final String NOTIFY_DOMAIN = "http://zyn.yocung.com";
46 46
......
...@@ -7,19 +7,19 @@ ...@@ -7,19 +7,19 @@
7 <sql id="outpropapply_pick_field"> 7 <sql id="outpropapply_pick_field">
8 PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID, 8 PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID,
9 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME, 9 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME,
10 - PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE 10 + PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE
11 </sql> 11 </sql>
12 12
13 <insert id="save" parameterType="OutpropApplyPickInfo"> 13 <insert id="save" parameterType="OutpropApplyPickInfo">
14 INSERT INTO HS_ASSET.OUTPROPAPPLY_PICK (PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID, 14 INSERT INTO HS_ASSET.OUTPROPAPPLY_PICK (PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID,
15 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME, 15 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME,
16 - PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE) 16 + PACKAGE_TYPE, PACKAGE_FEE, EXPRESS_PACK_FEE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE)
17 VALUES (#{pickNo}, #{clientId}, #{pickType}, #{pickAmount}, #{delegateName, jdbcType=VARCHAR}, #{delegateId, jdbcType=VARCHAR}, 17 VALUES (#{pickNo}, #{clientId}, #{pickType}, #{pickAmount}, #{delegateName, jdbcType=VARCHAR}, #{delegateId, jdbcType=VARCHAR},
18 #{zhaoonlineId, jdbcType=VARCHAR}, #{insurance}, '0', #{pickDate}, #{express, jdbcType=VARCHAR}, 18 #{zhaoonlineId, jdbcType=VARCHAR}, #{insurance}, '0', #{pickDate}, #{express, jdbcType=VARCHAR},
19 #{expressNo, jdbcType=VARCHAR}, #{createDate}, #{createTime}, 19 #{expressNo, jdbcType=VARCHAR}, #{createDate}, #{createTime},
20 #{packageType, jdbcType=VARCHAR}, #{packageFee, jdbcType=NUMERIC}, 20 #{packageType, jdbcType=VARCHAR}, #{packageFee, jdbcType=NUMERIC},
21 #{expressPackFee, jdbcType=NUMERIC}, #{amountFee, jdbcType=NUMERIC}, 21 #{expressPackFee, jdbcType=NUMERIC}, #{amountFee, jdbcType=NUMERIC},
22 - #{warehouseCode, jdbcType=VARCHAR}) 22 + #{warehouseCode, jdbcType=VARCHAR}, #{amount, jdbcType=VARCHAR}, #{trusteeshipCycle, jdbcType=NUMERIC})
23 </insert> 23 </insert>
24 24
25 <!-- 合并提货单 --> 25 <!-- 合并提货单 -->
......