yuhaitao14 7 years ago
parent
commit
4370b35dcb

+ 3 - 0
shop/src/main/java/com/zskk/shop/controller/web/BuyOrderController.java

@@ -161,6 +161,9 @@ public class BuyOrderController extends AbstractController {
 	@RequestMapping("/payed")
 	@RequestMapping("/payed")
 	@ResponseBody
 	@ResponseBody
 	public ControllerResult payed(@RequestParam("apporderid") String apporderid, @RequestParam("money") String money, @RequestParam("sign") String sign ){
 	public ControllerResult payed(@RequestParam("apporderid") String apporderid, @RequestParam("money") String money, @RequestParam("sign") String sign ){
+		String[] arr = apporderid.split("-");
+		apporderid = arr[0];
+		
 		Map<String, String> params = new HashMap<>();
 		Map<String, String> params = new HashMap<>();
 		params.put("apporderid", 	apporderid);
 		params.put("apporderid", 	apporderid);
 		params.put("money", 		money);
 		params.put("money", 		money);

+ 1 - 1
shop/src/main/java/com/zskk/shop/service/UserCenterService.java

@@ -52,7 +52,7 @@ public class UserCenterService {
 		Map<String, String> params = new HashMap<>();
 		Map<String, String> params = new HashMap<>();
 		params.put("accountid", account.getAccountid());
 		params.put("accountid", account.getAccountid());
 		params.put("companyid", companyid);
 		params.put("companyid", companyid);
-		params.put("apporderid", Long.toString(order.getId()));
+		params.put("apporderid", order.getId() + "_" + paytype);
 		params.put("payType", paytype.toString());
 		params.put("payType", paytype.toString());
 		params.put("payment", "1");
 		params.put("payment", "1");
 		params.put("customer", user.getUserid());
 		params.put("customer", user.getUserid());

+ 1 - 1
shop/src/main/resource/templates/fragments.html

@@ -20,7 +20,7 @@
 						<a href="http://testuc.pacsonline.cn/">登录</a><span></span>
 						<a href="http://testuc.pacsonline.cn/">登录</a><span></span>
 					</div>
 					</div>
 					<div th:if="${islogin}">
 					<div th:if="${islogin}">
-						<a class="reg" href="#" th:text="${user.name}"></a>
+						<a class="reg" href="/mypayedorders" th:text="${user.name}"></a>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>

+ 2 - 2
shop/src/main/resource/templates/pay.html

@@ -47,8 +47,8 @@
                     </tbody>
                     </tbody>
                 </table>
                 </table>
                 <div class="mt20 cOrange f12 fb">购买体检商品后您可以在个人中心直接预约体检时间</div>
                 <div class="mt20 cOrange f12 fb">购买体检商品后您可以在个人中心直接预约体检时间</div>
-                <div class="f14 bgF4 h32 lh32 pl20 mt20">发票信息</div>
-                <div class="tab-fb mt20">
+                <div class="f14 bgF4 h32 lh32 pl20 mt20" style="display: none;">发票信息</div>
+                <div class="tab-fb mt20" style="display: none;">
                     <div class="o-rdo">
                     <div class="o-rdo">
                         <input name="fapiao" checked="checked" type="radio" value="0" id="t1" class="fapiao" />
                         <input name="fapiao" checked="checked" type="radio" value="0" id="t1" class="fapiao" />
                         <label for="t1">不需要发票</label>
                         <label for="t1">不需要发票</label>