zyn / cjs-site

Go to a project
Toggle navigation Toggle navigation pinning
bruce
7fc85ce0 1 parent 089d6419

仓管费

Inline Side-by-side
Showing 3 changed files with 7 additions and 10 deletions
...@@ -57,7 +57,6 @@ public class PickPayBiz { ...@@ -57,7 +57,6 @@ public class PickPayBiz {
57 // multiply(new BigDecimal(pickTotal)).add(new BigDecimal("6")); 57 // multiply(new BigDecimal(pickTotal)).add(new BigDecimal("6"));
58 BigDecimal totalAmount = new BigDecimal("0.01");//调试接口代码写死 58 BigDecimal totalAmount = new BigDecimal("0.01");//调试接口代码写死
59 result.put("totalAmount", totalAmount); 59 result.put("totalAmount", totalAmount);
60 - String pickNo = pickBiz.createPickNo();
61 try { 60 try {
62 CreateQrCode createQrCode = new CreateQrCode(); 61 CreateQrCode createQrCode = new CreateQrCode();
63 createQrCode.setQrCodeId(UnionPayUtil.getQrCodeId()); 62 createQrCode.setQrCodeId(UnionPayUtil.getQrCodeId());
...@@ -67,7 +66,6 @@ public class PickPayBiz { ...@@ -67,7 +66,6 @@ public class PickPayBiz {
67 createQrCode.setBillDate(DateUtil.getNow(DateEnum.DATE)); 66 createQrCode.setBillDate(DateUtil.getNow(DateEnum.DATE));
68 //此处拼接提货信息 67 //此处拼接提货信息
69 OutpropApplyPickInfo pickInfo = (OutpropApplyPickInfo) session.getAttribute("pickInfo"); 68 OutpropApplyPickInfo pickInfo = (OutpropApplyPickInfo) session.getAttribute("pickInfo");
70 - pickInfo.setPickNo(pickNo);
71 createQrCode.setSrcReserve(JsonUtil.toJsonRemoveNull(pickInfo)); 69 createQrCode.setSrcReserve(JsonUtil.toJsonRemoveNull(pickInfo));
72 @SuppressWarnings("unchecked") 70 @SuppressWarnings("unchecked")
73 Map<String, String> mapTypes = JsonUtil.fromJson(JsonUtil.toJson(createQrCode), Map.class); 71 Map<String, String> mapTypes = JsonUtil.fromJson(JsonUtil.toJson(createQrCode), Map.class);
...@@ -75,7 +73,7 @@ public class PickPayBiz { ...@@ -75,7 +73,7 @@ public class PickPayBiz {
75 UnionResponse response = JsonUtil.fromJson(json, UnionResponse.class); 73 UnionResponse response = JsonUtil.fromJson(json, UnionResponse.class);
76 if (response != null && response.getErrCode().equals(UnionConstants.SUCCESS_CODE)) { 74 if (response != null && response.getErrCode().equals(UnionConstants.SUCCESS_CODE)) {
77 result.put("qrCode", UnionPayUtil.createQrCode(createQrCode.getQrCodeId())); 75 result.put("qrCode", UnionPayUtil.createQrCode(createQrCode.getQrCodeId()));
78 - insertPickPay(userId, createQrCode.getBillNo(), pickNo, createQrCode.getSrcReserve()); 76 + insertPickPay(userId, createQrCode.getBillNo(), createQrCode.getSrcReserve());
79 } else { 77 } else {
80 result.put("code", false); 78 result.put("code", false);
81 result.put("msg", response.getErrMsg()); 79 result.put("msg", response.getErrMsg());
...@@ -118,13 +116,12 @@ public class PickPayBiz { ...@@ -118,13 +116,12 @@ public class PickPayBiz {
118 return false; 116 return false;
119 } 117 }
120 118
121 - private void insertPickPay(String clientId, String tradeNo, String applyNo, String extInfo) { 119 + private void insertPickPay(String clientId, String tradeNo, String extInfo) {
122 OutpropApplyPayInfo insert = new OutpropApplyPayInfo(); 120 OutpropApplyPayInfo insert = new OutpropApplyPayInfo();
123 insert.setCreatedAt(DateUtil.getNow()); 121 insert.setCreatedAt(DateUtil.getNow());
124 insert.setClientId(clientId); 122 insert.setClientId(clientId);
125 insert.setStatus("1"); 123 insert.setStatus("1");
126 insert.setTradeNo(tradeNo); 124 insert.setTradeNo(tradeNo);
127 - insert.setApplyNo(applyNo);
128 insert.setExtInfo(extInfo); 125 insert.setExtInfo(extInfo);
129 outpropApplyPayDao.insert(insert); 126 outpropApplyPayDao.insert(insert);
130 } 127 }
......
...@@ -23,7 +23,7 @@ public class CreateQrCode implements Serializable { ...@@ -23,7 +23,7 @@ public class CreateQrCode implements Serializable {
23 private String totalAmount; 23 private String totalAmount;
24 private String qrCodeId; 24 private String qrCodeId;
25 private String returnUrl = "https://www.zhao.com/login"; 25 private String returnUrl = "https://www.zhao.com/login";
26 - private String notifyUrl = "http://192.168.10.106/notify.do"; 26 + private String notifyUrl = "http://192.168.10.106//pick/pay/notify";
27 27
28 public String getMsgSrc() { 28 public String getMsgSrc() {
29 return msgSrc; 29 return msgSrc;
......
...@@ -7,20 +7,20 @@ ...@@ -7,20 +7,20 @@
7 <id property="tradeNo" column="TRADE_NO" /> 7 <id property="tradeNo" column="TRADE_NO" />
8 <result property="createdAt" column="CREATED_AT" /> 8 <result property="createdAt" column="CREATED_AT" />
9 <result property="updatedAt" column="UPDATED_AT" /> 9 <result property="updatedAt" column="UPDATED_AT" />
10 - <result property="applyNo" column="APPLY_NO" /> 10 + <result property="clientId" column="CLIENT_ID" />
11 <result property="payAt" column="PAY_AT" /> 11 <result property="payAt" column="PAY_AT" />
12 <result property="status" column="STATUS" /> 12 <result property="status" column="STATUS" />
13 <result property="extInfo" column="EXT_INFO" /> 13 <result property="extInfo" column="EXT_INFO" />
14 </resultMap> 14 </resultMap>
15 15
16 <sql id="base_field"> 16 <sql id="base_field">
17 - TRADE_NO,CREATED_AT,UPDATED_AT,APPLY_NO,PAY_AT,STATUS,EXT_INFO 17 + TRADE_NO,CREATED_AT,UPDATED_AT,PAY_AT,STATUS,EXT_INFO,CLIENT_ID
18 </sql> 18 </sql>
19 19
20 <insert id="insert" parameterType="OutpropApplyPayInfo"> 20 <insert id="insert" parameterType="OutpropApplyPayInfo">
21 - INSERT INTO HS_ASSET.OUTPROPAPPLY_PAY (TRADE_NO,CREATED_AT,UPDATED_AT,APPLY_NO,PAY_AT,STATUS,EXT_INFO) 21 + INSERT INTO HS_ASSET.OUTPROPAPPLY_PAY (TRADE_NO,CREATED_AT,UPDATED_AT,PAY_AT,STATUS,EXT_INFO,CLIENT_ID)
22 VALUES (#{tradeNo, jdbcType=VARCHAR}, #{createdAt, jdbcType=VARCHAR}, #{updatedAt, jdbcType=VARCHAR}, 22 VALUES (#{tradeNo, jdbcType=VARCHAR}, #{createdAt, jdbcType=VARCHAR}, #{updatedAt, jdbcType=VARCHAR},
23 - #{applyNo, jdbcType=VARCHAR}, #{payAt, jdbcType=VARCHAR}, #{status, jdbcType=VARCHAR}, #{extInfo, jdbcType=VARCHAR}) 23 + #{payAt, jdbcType=VARCHAR}, #{status, jdbcType=VARCHAR}, #{extInfo, jdbcType=VARCHAR}, #{clientId, jdbcType=VARCHAR})
24 </insert> 24 </insert>
25 25
26 <select id="selectByTradeNo" parameterType="java.lang.String" resultMap="BaseMap"> 26 <select id="selectByTradeNo" parameterType="java.lang.String" resultMap="BaseMap">
......