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

!229 adding generateOrder error msg logic

Browse Source 
Merge pull request !229 from Admin/sit-Carl
This commit is contained in:
Admin 2022-03-14 09:28:03 +00:00 committed by Gitee
commit df81010e37
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 88 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc-busness/ajax/getData.js
View File

@ -69,7 +69,7 @@ export const postCourseId = (productCode, buyCount, memberId, mobile, productImg
leftAllotment: leftAllotment, leftAllotment: leftAllotment,
basePiont: basePiont basePiont: basePiont
} }
return fetch('/insertCartProductInfo', data,'POST') return fetch('insertCartProductInfo', data,'POST')
} }
/** /**
* 是否存在购物车 * 是否存在购物车

41
rc-busness/pages/personal/settlement.vue
View File

@ -318,18 +318,30 @@ export default {
} else { } else {
//Into coupon discount calculation //Into coupon discount calculation
switch(this.curCoupon.couponTypeId) { switch(this.curCoupon.couponTypeId) {
case 1: //Amount deduct case 1: //Amount deduct
total = total + (itemInCart.productPrice * itemInCart.buyCount - this.curCoupon.couponAmount); if(this.curCoupon.couponAmount && this.curCoupon.couponAmount <= (itemInCart.productPrice * itemInCart.buyCount)) {
this.discountAmount = this.curCoupon.couponAmount; total = total + (itemInCart.productPrice * itemInCart.buyCount - this.curCoupon.couponAmount);
this.discountedProductCode = itemInCart.productCode; this.discountAmount = this.curCoupon.couponAmount;
couponUsed=true; this.discountedProductCode = itemInCart.productCode;
couponUsed=true;
} else if(this.curCoupon.couponAmount && this.curCoupon.couponAmount > (itemInCart.productPrice * itemInCart.buyCount)) {
total = total + itemInCart.productPrice * itemInCart.buyCount;
this.discountAmount = 0;
this.curCoupon = {couponName:'未能使用该优惠券'};
}
break; break;
case 2: //Amount deduct with minPrice restriction case 2: //Amount deduct with minPrice restriction
case 6: case 6:
total = total + (itemInCart.productPrice * itemInCart.buyCount) - this.curCoupon.couponAmount; if(this.curCoupon.couponAmount && this.curCoupon.couponAmount <= (itemInCart.productPrice * itemInCart.buyCount)) {
this.discountAmount = this.curCoupon.couponAmount; total = total + (itemInCart.productPrice * itemInCart.buyCount) - this.curCoupon.couponAmount;
this.discountedProductCode = itemInCart.productCode; this.discountAmount = this.curCoupon.couponAmount;
couponUsed=true; this.discountedProductCode = itemInCart.productCode;
couponUsed=true;
} else if(this.curCoupon.couponAmount && this.curCoupon.couponAmount > (itemInCart.productPrice * itemInCart.buyCount)) {
total = total + itemInCart.productPrice * itemInCart.buyCount;
this.discountAmount = 0;
this.curCoupon = {couponName:'未能使用该优惠券'};
}
break; break;
case 3: //Limited product % discount case 3: //Limited product % discount
case 4: //% discount case 4: //% discount
@ -417,7 +429,7 @@ export default {
valDateFromTime=0; valDateFromTime=0;
valDateToTime=0; valDateToTime=0;
dateChecked=true; dateChecked=true;
/* /* */
if(myCoupon.fValidFrom) { if(myCoupon.fValidFrom) {
//Fix ios date issue //Fix ios date issue
myCoupon.fValidFrom = myCoupon.fValidFrom.replace(/-/g, '/'); myCoupon.fValidFrom = myCoupon.fValidFrom.replace(/-/g, '/');
@ -435,19 +447,22 @@ export default {
if(valDateToTime && curTime > valDateToTime) { if(valDateToTime && curTime > valDateToTime) {
dateChecked=false; dateChecked=false;
} }
*/
if(myCoupon.minQuantity && myCoupon.minQuantity>itemInCart.buyCount) { if(myCoupon.minQuantity && myCoupon.minQuantity>itemInCart.buyCount) {
dateChecked=false; dateChecked=false;
} }
if(myCoupon.minPrice && myCoupon.minPrice>this.sumPrice) { if(myCoupon.minPrice && myCoupon.minPrice>this.sumPrice) {
dateChecked=false; dateChecked=false;
} }
if(myCoupon.couponAmount && myCoupon.couponAmount>this.sumPrice) {
dateChecked=false;
}
if(myCoupon.udf2!='H5') { if(myCoupon.udf2!='H5') {
dateChecked=false; dateChecked=false;
} }
//if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) { if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) {
if(dateChecked) { //if(dateChecked) {
//data.data.splice(tmpIndex,1); //data.data.splice(tmpIndex,1);
_self.drawlist.push(myCoupon); _self.drawlist.push(myCoupon);
avaliableCouponNum++; avaliableCouponNum++;

1
rc-busness/pages/productdetails/producted.vue
View File

@ -344,7 +344,6 @@ export default {
let stopIndex = 0; let stopIndex = 0;
for(let singleCode of productCode) { for(let singleCode of productCode) {
let data = await goodsmessage(singleCode); let data = await goodsmessage(singleCode);
console.log(data);
if (data && data.length>0) { if (data && data.length>0) {
newlist.push(data[0]); newlist.push(data[0]);

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

@ -18,7 +18,9 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderRespon
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQueryEntity;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.GoodService;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity;
@ -55,6 +57,9 @@ public class OrderController {
@Autowired @Autowired
private CouponService couponService; private CouponService couponService;
@Autowired
private GoodService goodService;
@ApiOperation(value = "微信支付订单", notes = "生成订单") @ApiOperation(value = "微信支付订单", notes = "生成订单")
@PostMapping("royalcanin/generateOrderWX") @PostMapping("royalcanin/generateOrderWX")
@ -77,11 +82,17 @@ public class OrderController {
//删除购物车信息 //删除购物车信息
cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode()); cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode());
//存储orderDetailList //存储orderDetailList
ProductMasterQueryEntity productMasterQueryEntity = new ProductMasterQueryEntity();
productMasterQueryEntity.setProductCode(ordersEntitys.getProductCode());
String goodsStr = goodService.productQuery(productMasterQueryEntity);
com.alibaba.fastjson.JSONArray jsonGoodsArray = JSONObject.parseArray(goodsStr);
JSONObject goodsObject = (JSONObject)jsonGoodsArray.get(0);
OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity(); OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity();
orderDatilListEntity.setProductName(ordersEntitys.getProductName()); orderDatilListEntity.setProductName(goodsObject.getString("productName"));
orderDatilListEntity.setPcs(ordersEntitys.getBuyCount()); orderDatilListEntity.setPcs(ordersEntitys.getBuyCount());
orderDatilListEntity.setProductCode(ordersEntitys.getProductCode()); orderDatilListEntity.setProductCode(goodsObject.getString("productCode"));
orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); orderDatilListEntity.setEcPrice(goodsObject.getString("ecPrice"));
orderDatilListJson.add(orderDatilListEntity); orderDatilListJson.add(orderDatilListEntity);
if (ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { if (ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) {
CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity(); CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity();
@ -103,9 +114,10 @@ public class OrderController {
ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); ordersEntity.setCouponCode(jsonObjectData.getString("couponCode"));
ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
ordersEntity.setCouponId(jsonObjectData.getString("couponId")); ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(), Double.parseDouble(ordersEntitys.getCouponAmount()), Double.parseDouble(ordersEntitys.getPayAmount()), ordersEntitys.getBuyCount()); ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
total_fee = total_fee + orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), Double.parseDouble(goodsObject.getString("ecPrice")), ordersEntitys.getBuyCount());
} else { } else {
total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount(); total_fee = total_fee + Double.parseDouble(goodsObject.getString("ecPrice")) * ordersEntitys.getBuyCount();
} }
basePoint = basePoint + ordersEntitys.getBasePoint(); basePoint = basePoint + ordersEntitys.getBasePoint();
orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());
@ -170,18 +182,25 @@ public class OrderController {
JSONArray orderDatilListJson = new JSONArray(); JSONArray orderDatilListJson = new JSONArray();
OrdersEntity ordersEntity = new OrdersEntity(); OrdersEntity ordersEntity = new OrdersEntity();
OrderAddress orderAddress = new OrderAddress(); OrderAddress orderAddress = new OrderAddress();
try{ try {
for (OrdersEntity ordersEntitys:ordersEntityList) { for (OrdersEntity ordersEntitys : ordersEntityList) {
cartService.cancelProduct(ordersEntitys.getMemberId(),ordersEntity.getProductCode()); //删除购物车信息
cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode());
//存储orderDetailList //存储orderDetailList
OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity(); ProductMasterQueryEntity productMasterQueryEntity = new ProductMasterQueryEntity();
orderDatilListEntity.setProductName(ordersEntitys.getProductName()); productMasterQueryEntity.setProductCode(ordersEntitys.getProductCode());
String goodsStr = goodService.productQuery(productMasterQueryEntity);
com.alibaba.fastjson.JSONArray jsonGoodsArray = JSONObject.parseArray(goodsStr);
JSONObject goodsObject = (JSONObject)jsonGoodsArray.get(0);
OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity();
orderDatilListEntity.setProductName(goodsObject.getString("productName"));
orderDatilListEntity.setPcs(ordersEntitys.getBuyCount()); orderDatilListEntity.setPcs(ordersEntitys.getBuyCount());
orderDatilListEntity.setProductCode(ordersEntitys.getProductCode()); orderDatilListEntity.setProductCode(goodsObject.getString("productCode"));
orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); orderDatilListEntity.setEcPrice(goodsObject.getString("ecPrice"));
orderDatilListJson.add(orderDatilListEntity); orderDatilListJson.add(orderDatilListEntity);
if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { if (ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) {
CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity (); CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity();
couponGetAllEntity.setMemberId(ordersEntitys.getMemberId()); couponGetAllEntity.setMemberId(ordersEntitys.getMemberId());
couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode()); couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode());
String couponInfo = couponService.couponGetAll(couponGetAllEntity); String couponInfo = couponService.couponGetAll(couponGetAllEntity);
@ -196,14 +215,14 @@ public class OrderController {
return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL); return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
} }
} }
ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ? jsonObjectData.getString("discount") : jsonObjectData.getString("couponAmount"));
ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ?jsonObjectData.getString("discount"):jsonObjectData.getString("couponAmount"));
ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); ordersEntity.setCouponCode(jsonObjectData.getString("couponCode"));
ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
ordersEntity.setCouponId(jsonObjectData.getString("couponId")); ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(),Double.parseDouble(ordersEntitys.getCouponAmount()),Double.parseDouble(ordersEntitys.getPayAmount()),ordersEntitys.getBuyCount()); ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
}else{ total_fee = total_fee + orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), Double.parseDouble(goodsObject.getString("ecPrice")), ordersEntitys.getBuyCount());
total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ; } else {
total_fee = total_fee + Double.parseDouble(goodsObject.getString("ecPrice")) * ordersEntitys.getBuyCount();
} }
basePoint = basePoint + ordersEntitys.getBasePoint(); basePoint = basePoint + ordersEntitys.getBasePoint();
orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());
@ -266,18 +285,25 @@ public class OrderController {
JSONArray orderDatilListJson = new JSONArray(); JSONArray orderDatilListJson = new JSONArray();
OrdersEntity ordersEntity = new OrdersEntity(); OrdersEntity ordersEntity = new OrdersEntity();
OrderAddress orderAddress = new OrderAddress(); OrderAddress orderAddress = new OrderAddress();
try{ try {
for (OrdersEntity ordersEntitys:ordersEntityList) { for (OrdersEntity ordersEntitys : ordersEntityList) {
cartService.cancelProduct(ordersEntitys.getMemberId(),ordersEntity.getProductCode()); //删除购物车信息
cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode());
//存储orderDetailList //存储orderDetailList
OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity(); ProductMasterQueryEntity productMasterQueryEntity = new ProductMasterQueryEntity();
orderDatilListEntity.setProductName(ordersEntitys.getProductName()); productMasterQueryEntity.setProductCode(ordersEntitys.getProductCode());
String goodsStr = goodService.productQuery(productMasterQueryEntity);
com.alibaba.fastjson.JSONArray jsonGoodsArray = JSONObject.parseArray(goodsStr);
JSONObject goodsObject = (JSONObject)jsonGoodsArray.get(0);
OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity();
orderDatilListEntity.setProductName(goodsObject.getString("productName"));
orderDatilListEntity.setPcs(ordersEntitys.getBuyCount()); orderDatilListEntity.setPcs(ordersEntitys.getBuyCount());
orderDatilListEntity.setProductCode(ordersEntitys.getProductCode()); orderDatilListEntity.setProductCode(goodsObject.getString("productCode"));
orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); orderDatilListEntity.setEcPrice(goodsObject.getString("ecPrice"));
orderDatilListJson.add(orderDatilListEntity); orderDatilListJson.add(orderDatilListEntity);
if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { if (ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) {
CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity (); CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity();
couponGetAllEntity.setMemberId(ordersEntitys.getMemberId()); couponGetAllEntity.setMemberId(ordersEntitys.getMemberId());
couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode()); couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode());
String couponInfo = couponService.couponGetAll(couponGetAllEntity); String couponInfo = couponService.couponGetAll(couponGetAllEntity);
@ -292,14 +318,14 @@ public class OrderController {
return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL); return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
} }
} }
ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ? jsonObjectData.getString("discount") : jsonObjectData.getString("couponAmount"));
ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ?jsonObjectData.getString("discount"):jsonObjectData.getString("couponAmount"));
ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); ordersEntity.setCouponCode(jsonObjectData.getString("couponCode"));
ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
ordersEntity.setCouponId(jsonObjectData.getString("couponId")); ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(),Double.parseDouble(ordersEntitys.getCouponAmount()),Double.parseDouble(ordersEntitys.getPayAmount()),ordersEntitys.getBuyCount()); ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
}else{ total_fee = total_fee + orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), Double.parseDouble(goodsObject.getString("ecPrice")), ordersEntitys.getBuyCount());
total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ; } else {
total_fee = total_fee + Double.parseDouble(goodsObject.getString("ecPrice")) * ordersEntitys.getBuyCount();
} }
basePoint = basePoint + ordersEntitys.getBasePoint(); basePoint = basePoint + ordersEntitys.getBasePoint();
orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());