diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/PayTypeEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/PayTypeEnums.java new file mode 100644 index 0000000..f6f71a3 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/PayTypeEnums.java @@ -0,0 +1,30 @@ +package com.heyu.api.data.enums; + +public enum PayTypeEnums { + weixin("weixin","微信"); + + private String type ; + + private String desc; + + PayTypeEnums(String type, String desc) { + this.type = type; + this.desc = desc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index 4e78c33..4e1ef53 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -14,6 +14,7 @@ import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.dto.WeiXinPayDelayDTO; import com.heyu.api.data.entity.vv.*; import com.heyu.api.data.enums.DelayTypeEnums; +import com.heyu.api.data.enums.PayTypeEnums; import com.heyu.api.data.enums.RoleEnums; import com.heyu.api.data.utils.*; import com.heyu.api.jsapi.JsapiPrepay; @@ -277,7 +278,6 @@ public class AppOrderController { propertyNameValues.add(propertyNameValue); } - for (int i = 0; i < vvTradeOrderLineDTO.getNum(); i++) { VvTradeOrderLineEntity vvTradeOrderLineEntity = new VvTradeOrderLineEntity(); vvTradeOrderLineEntity.setSkuId(vvTradeOrderLineDTO.getSkuId()); @@ -302,8 +302,8 @@ public class AppOrderController { vvTradeOrderLineEntity.setStatus(OrderStatusEnums.create.getStatus()); vvTradeOrderLineEntity.setBuyerId(vvOrderRequest.getBuyerId()); vvTradeOrderLineEntity.setBuyerAddressId(vvOrderRequest.getBuyerAddressId()); - vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity); vvTradeOrderLineEntity.setBatchNum(vvTradeOrderLineDTO.getNum()); + vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity); } } @@ -341,6 +341,7 @@ public class AppOrderController { for (Map.Entry map : productNumMap.entrySet()) { vvProductDao.updateShowSaleCountAndSaleCount(map.getValue(), map.getValue(), map.getKey()); } + DirectAPIv3JsapiPrepayResponse jsapiPrepayResponse = jsapiPrepay.prePay(vvTradeOrderEntity.getId(), BigDecimalUtil.multiply(vvTradeOrderEntity.getAllPrice(), new BigDecimal(100)).longValue(), vvBuyerEntity.getOpenid() @@ -350,7 +351,7 @@ public class AppOrderController { if (jsapiPrepayResponse != null && jsapiPrepayResponse.getPrepayId() != null) { List vvTradeOrderLineEntities = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(vvTradeOrderEntity.getId()); for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) { - vvTradeOrderLineEntity.setPayType("weixin"); + vvTradeOrderLineEntity.setPayType(PayTypeEnums.weixin.getType()); vvTradeOrderLineEntity.setStatus(OrderStatusEnums.wait_pay.getStatus()); vvTradeOrderLineEntity.setPrepayId(jsapiPrepayResponse.getPrepayId()); vvTradeOrderLineEntity.setGmtPrePay(new Date());