From b9361b8eea2fe2a7f436d0719364191d819ecba2 Mon Sep 17 00:00:00 2001 From: "602090531@qq.com" Date: Thu, 17 Mar 2022 10:09:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A7=A3=E5=AF=86?= =?UTF-8?q?=E5=90=8E=E7=9A=84data=E7=9A=84log=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/royalcanin/good/service/OrderService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index ed608463..78f1ac11 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -1,5 +1,6 @@ package net.lab1024.smartadmin.module.system.royalcanin.good.service; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import net.lab1024.smartadmin.common.domain.ResponseDTO; @@ -253,6 +254,10 @@ public class OrderService { JSONObject jsonObject = JSONObject.parseObject(result); String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY); com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult); + //获取的是接收的数据 + jsonObject.put("data", jsonArray); + result = JSONObject.toJSONString(jsonObject); + for (int i = 0; i < jsonArray.size();i++){ JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i); OrderEntity orderEntity = ordersDao.findByOrderId(jsonObjectResult.getString("orderNumber")); @@ -277,6 +282,7 @@ public class OrderService { } } + //记录服务响应时间 addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime); @@ -338,4 +344,5 @@ public class OrderService { public int updateOrder(String orderNumber){ return ordersDao.updateByOrderNumber(orderNumber); } + } From 57f05da254ad2492ac297c85e342a4f59dabdd34 Mon Sep 17 00:00:00 2001 From: "602090531@qq.com" Date: Thu, 17 Mar 2022 15:26:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=88=B0?= =?UTF-8?q?=E7=94=9F=E6=95=88=E6=97=B6=E9=97=B4=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/royalcanin/CouponService.java | 10 ++++++-- .../royalcanin/good/OrderController.java | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java index 9fda9f7b..f0ec9624 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java @@ -56,13 +56,19 @@ public class CouponService { JSONObject jsonObjectResult = JSONObject.parseObject(result); com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObjectResult.getString("data")); com.alibaba.fastjson.JSONArray afterFilterArrary = new JSONArray(); + Date nowDate =SmartDateUtil.parseYMD(SmartDateUtil.formatYMD(new Date())); for(int i = 0;i < jsonArray.size();i ++){ JSONObject jsonResult = (JSONObject)jsonArray.get(i); if(jsonResult.getString("udf2") != null) { + //优惠券有效过期时间 Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString()); - if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1) { + //优惠券有效开始时间 + Date startDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString()); + if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 + && startDate.compareTo(nowDate) != 1) { afterFilterArrary.add(jsonResult); - }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1){ + }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 + && startDate.compareTo(nowDate) != 1){ for(int g = 0 ;g Date: Thu, 17 Mar 2022 15:42:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=88=B0?= =?UTF-8?q?=E7=94=9F=E6=95=88=E6=97=B6=E9=97=B4=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../royalcanin/good/OrderController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 444ee293..36da1352 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -13,6 +13,7 @@ import net.lab1024.smartadmin.module.system.alipay.AliPayService; import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity; import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig; import net.lab1024.smartadmin.module.system.royalcanin.CouponService; +import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponCosumeEntity; import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponGetAllEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; @@ -137,6 +138,14 @@ public class OrderController { ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponId(jsonObjectData.getString("couponId")); ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId")); + //通过传优惠券码锁定优惠券 + CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); + couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode")); + String result = couponService.couponCosume(couponCosumeEntity); + JSONObject couponJsonResult = JSONObject.parseObject(result); + if(!"0".equals(couponJsonResult.getString("code"))){ + return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL); + } total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee); } ordersEntity.setOrderAddress(orderAddress); @@ -247,6 +256,14 @@ public class OrderController { ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponId(jsonObjectData.getString("couponId")); ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId")); + //通过传优惠券码锁定优惠券 + CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); + couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode")); + String result = couponService.couponCosume(couponCosumeEntity); + JSONObject couponJsonResult = JSONObject.parseObject(result); + if(!"0".equals(couponJsonResult.getString("code"))){ + return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL); + } total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee); } ordersEntity.setOrderAddress(orderAddress); @@ -356,6 +373,14 @@ public class OrderController { ordersEntity.setCouponName(jsonObjectData.getString("couponName")); ordersEntity.setCouponId(jsonObjectData.getString("couponId")); ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId")); + //通过传优惠券码锁定优惠券 + CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); + couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode")); + String result = couponService.couponCosume(couponCosumeEntity); + JSONObject couponJsonResult = JSONObject.parseObject(result); + if(!"0".equals(couponJsonResult.getString("code"))){ + return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL); + } total_fee = orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee); } ordersEntity.setOrderAddress(orderAddress);