xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-05 19:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugger

Browse Source
This commit is contained in:
Carl 2022-02-02 17:35:23 +08:00
parent 9693a05646
commit 4256bb3ef7
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
View File

@ -72,7 +72,7 @@ public class OrderController {
OrderAddress orderAddress = new OrderAddress(); OrderAddress orderAddress = new OrderAddress();
try { try {
for (OrdersEntity ordersEntitys : ordersEntityList) { for (OrdersEntity ordersEntitys : ordersEntityList) {
System.out.println("ordersEntityList.size()"+ordersEntityList.size()); // System.out.println("ordersEntityList.size()"+ordersEntityList.size());
cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode()); cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode());
//存储orderDetailList //存储orderDetailList
OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity(); OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity();
@ -99,7 +99,7 @@ public class OrderController {
total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount(); total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount();
} }
basePoint = basePoint + ordersEntitys.getBasePoint(); basePoint = basePoint + ordersEntitys.getBasePoint();
System.out.println("basePoint"+basePoint); // System.out.println("basePoint"+basePoint);
orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());
orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName()); orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName());
orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo()); orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo());
@ -122,8 +122,8 @@ public class OrderController {
ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo());
ordersEntity.setOrderStatus("0"); ordersEntity.setOrderStatus("0");
ordersEntity.setBasePoint(basePoint); ordersEntity.setBasePoint(basePoint);
int result = orderService.generateOrder(ordersEntity, orderDatilListJson);
if (orderService.generateOrder(ordersEntity, orderDatilListJson) == 1) { if (result == 1) {
System.out.println("orderService.generateOrder(ordersEntity, orderDatilListJson) == 1"); System.out.println("orderService.generateOrder(ordersEntity, orderDatilListJson) == 1");
wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setProduct_id(ordersEntity.getProductCode());
wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee));
@ -132,6 +132,8 @@ public class OrderController {
returnMap.put("orderNumber", ordersEntity.getOrderNo()); returnMap.put("orderNumber", ordersEntity.getOrderNo());
returnMap.put("orderAmount", ordersEntity.getOrderAmount()); returnMap.put("orderAmount", ordersEntity.getOrderAmount());
return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity)); return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity));
}else if (result == 3){
return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_FAIL_COUPONDED);
} }
}catch (Exception e){ }catch (Exception e){
System.out.println(e.getMessage()); System.out.println(e.getMessage());

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java
View File

@ -12,6 +12,8 @@ public class OrderResponseCodeConst extends ResponseCodeConst {
public static final OrderResponseCodeConst GENERATE_FAIL = new OrderResponseCodeConst(9003, "数据生成失败！"); public static final OrderResponseCodeConst GENERATE_FAIL = new OrderResponseCodeConst(9003, "数据生成失败！");
public static final OrderResponseCodeConst GENERATE_FAIL_COUPONDED = new OrderResponseCodeConst(9004, "优惠券已使用！");
public static final OrderResponseCodeConst SMS_FAIL = new OrderResponseCodeConst(9005, " 短信校验失败！"); public static final OrderResponseCodeConst SMS_FAIL = new OrderResponseCodeConst(9005, " 短信校验失败！");
public static final OrderResponseCodeConst SMS_OVERTIME = new OrderResponseCodeConst(9006, "短信校验超时！"); public static final OrderResponseCodeConst SMS_OVERTIME = new OrderResponseCodeConst(9006, "短信校验超时！");

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -63,7 +63,7 @@ public class OrderService {
couponCosumeEntity.setRealCouponAmount(realCouponAmount); couponCosumeEntity.setRealCouponAmount(realCouponAmount);
JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity)); JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity));
if (!jsonObject.getString("code").equals("0")) { if (!jsonObject.getString("code").equals("0")) {
return 0; return 3;
} }
//coupon json化 //coupon json化
OrderCouponEntity orderCouponEntity = new OrderCouponEntity(); OrderCouponEntity orderCouponEntity = new OrderCouponEntity();