From 61fe12c087e6fee2c699adc394d832c190973033 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 11 Jul 2024 10:12:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?sku=20=E6=96=B0=E5=A2=9E=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5=20=E5=92=8C=20=E8=B5=B7?= =?UTF-8?q?=E5=94=AE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/entity/TbProductSku.java | 3 +++ src/main/resources/mapper/TbProductSkuMapper.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java index 9c387dc..0c6f71f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductSku.java @@ -29,6 +29,8 @@ public class TbProductSku implements Serializable { private BigDecimal strategyPrice; + private Integer suit; + private Double stockNumber; private String coverImg; @@ -50,6 +52,7 @@ public class TbProductSku implements Serializable { private Long updatedAt; private Integer isPauseSale = 0; + private Integer isDel; private static final long serialVersionUID = 1L; } diff --git a/src/main/resources/mapper/TbProductSkuMapper.xml b/src/main/resources/mapper/TbProductSkuMapper.xml index 42cdd9f..1ed3165 100644 --- a/src/main/resources/mapper/TbProductSkuMapper.xml +++ b/src/main/resources/mapper/TbProductSkuMapper.xml @@ -344,7 +344,7 @@ - select + select , @@ -49,21 +50,21 @@ where id = #{id,jdbcType=INTEGER} - insert into tb_product_sku (id, shop_id, bar_code, - product_id, origin_price, cost_price, - member_price, meal_price, sale_price, - guide_price, strategy_price, stock_number, - cover_img, warn_line, weight, - volume, real_sales_number, first_shared, - second_shared, created_at, updated_at, + insert into tb_product_sku (id, shop_id, bar_code, + product_id, origin_price, cost_price, + member_price, meal_price, sale_price, + guide_price, strategy_price, stock_number, + cover_img, warn_line, weight, + volume, real_sales_number, first_shared, + second_shared, created_at, updated_at, spec_info, spec_snap) - values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=VARCHAR}, #{barCode,jdbcType=VARCHAR}, - #{productId,jdbcType=VARCHAR}, #{originPrice,jdbcType=DECIMAL}, #{costPrice,jdbcType=DECIMAL}, - #{memberPrice,jdbcType=DECIMAL}, #{mealPrice,jdbcType=DECIMAL}, #{salePrice,jdbcType=DECIMAL}, - #{guidePrice,jdbcType=DECIMAL}, #{strategyPrice,jdbcType=DECIMAL}, #{stockNumber,jdbcType=DOUBLE}, - #{coverImg,jdbcType=VARCHAR}, #{warnLine,jdbcType=INTEGER}, #{weight,jdbcType=DOUBLE}, - #{volume,jdbcType=REAL}, #{realSalesNumber,jdbcType=DOUBLE}, #{firstShared,jdbcType=DECIMAL}, - #{secondShared,jdbcType=DECIMAL}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, + values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=VARCHAR}, #{barCode,jdbcType=VARCHAR}, + #{productId,jdbcType=VARCHAR}, #{originPrice,jdbcType=DECIMAL}, #{costPrice,jdbcType=DECIMAL}, + #{memberPrice,jdbcType=DECIMAL}, #{mealPrice,jdbcType=DECIMAL}, #{salePrice,jdbcType=DECIMAL}, + #{guidePrice,jdbcType=DECIMAL}, #{strategyPrice,jdbcType=DECIMAL}, #{stockNumber,jdbcType=DOUBLE}, + #{coverImg,jdbcType=VARCHAR}, #{warnLine,jdbcType=INTEGER}, #{weight,jdbcType=DOUBLE}, + #{volume,jdbcType=REAL}, #{realSalesNumber,jdbcType=DOUBLE}, #{firstShared,jdbcType=DECIMAL}, + #{secondShared,jdbcType=DECIMAL}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{specInfo,jdbcType=LONGVARCHAR}, #{specSnap,jdbcType=LONGVARCHAR}) @@ -364,4 +365,4 @@ - \ No newline at end of file + From ef73fe192a186ed114fad946da129f0e0a158ce8 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 11 Jul 2024 13:48:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B5=B7=E5=94=AE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/OrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 910f6c1..50675dd 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -276,7 +276,7 @@ public class OrderService { shopOpenIds.forEach(item -> { wechatUtil.sendStockWarnMsg(shopInfo.getShopName(), product.getName(), product.getIsDistribute() == 1 ? String.valueOf(product.getStockNumber()-num) : String.valueOf(productSku.getStockNumber() - num), - "耗材库存不足，请及时补充。", item.getOpenId()); + "商品库存不足，请及时补充。", item.getOpenId()); }); } } From 6e7ee2137b30ef855207e04ed48a4a267e893f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Thu, 11 Jul 2024 13:51:22 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E5=85=85=E5=80=BC=E6=93=8D=E4=BD=9C=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/TbmerchantAccount.java | 10 ++++++++ .../interceptor/SignInterceptor.java | 2 -- .../cashierservice/service/MemberService.java | 23 +++++++++++++++++++ .../system/cashierservice/sign/CodeEnum.java | 3 +++ .../mapper/TbmerchantAccountMapper.xml | 4 +++- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbmerchantAccount.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbmerchantAccount.java index 77e7ecd..f19f5fe 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbmerchantAccount.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbmerchantAccount.java @@ -45,6 +45,8 @@ public class TbmerchantAccount implements Serializable { private String headImg; + private String pwd; + private static final long serialVersionUID = 1L; public Integer getId() { @@ -214,4 +216,12 @@ public class TbmerchantAccount implements Serializable { public void setHeadImg(String headImg) { this.headImg = headImg == null ? null : headImg.trim(); } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + } } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java b/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java index 61133cb..c4bf560 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/SignInterceptor.java @@ -37,8 +37,6 @@ public class SignInterceptor implements HandlerInterceptor { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - - String requestURI = request.getRequestURI(); if (HttpMethod.OPTIONS.toString().equals(request.getMethod())) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index 6ce9851..d0dd3b9 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -31,6 +31,7 @@ import java.math.RoundingMode; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; @Service public class MemberService { @@ -73,6 +74,9 @@ public class MemberService { @Value("${thirdPay.callBack}") private String callBack; + @Autowired + TbmerchantAccountMapper tbmerchantAccountMapper; + public Result queryMember(String shopId, String phone, int page, int pageSize) { PageHelperUtil.startPage(page, pageSize); @@ -519,10 +523,29 @@ public class MemberService { || !map.containsKey("shopId") || ObjectUtil.isEmpty(map.get("shopId")) || !map.containsKey("memberId") || ObjectUtil.isEmpty(map.get("memberId")) || !map.containsKey("amount") || ObjectUtil.isEmpty(map.get("amount")) + ||!map.containsKey("pwd")||ObjectUtil.isEmpty(map.get("pwd")) ) { return Result.fail(CodeEnum.PARAM); } + + String accountId= TokenUtil.parseParamFromToken(token).getString("accountId"); + + TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); + if(Objects.isNull(account)){ + return Result.fail(CodeEnum.ACCOUNTEIXST); + } + + + if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ + return Result.fail(CodeEnum.PWDNOSET); + } + + if(!account.getPwd().equals(MD5Util.encrypt(map.get("pwd").toString().concat(account.getAccount()).concat(account.getId().toString())))){ + return Result.fail(CodeEnum.PWDERROE); + } + + String memberId = String.valueOf(map.get("memberId")); String shopId = String.valueOf(map.get("shopId")); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java b/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java index 6f5757d..bdcbf61 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java @@ -98,8 +98,11 @@ public enum CodeEnum { CONSERROR("100036",false,"商品已售罄","fail"), + PWDNOSET("100037",false,"操作密码未设置","fail"), + PWDERROE("100038",false,"操作密码错误","fail"), + diff --git a/src/main/resources/mapper/TbmerchantAccountMapper.xml b/src/main/resources/mapper/TbmerchantAccountMapper.xml index 1a5a139..d2c75cc 100644 --- a/src/main/resources/mapper/TbmerchantAccountMapper.xml +++ b/src/main/resources/mapper/TbmerchantAccountMapper.xml @@ -22,6 +22,8 @@ + + @@ -29,7 +31,7 @@ id, account, password, merchant_id, shop_id, shop_snap, is_admin, is_mercantile, name, sex, email, telephone, status, sort, role_id, last_login_at, mp_open_id, msg_able, - created_at, updated_at + created_at, updated_at,pwd head_img From 63ae10c9718abebcb74df9d3c903eebacde0b47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Thu, 11 Jul 2024 14:23:24 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/PayController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 96d10d9..2640e75 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -215,9 +215,10 @@ public class PayController { public Result returnOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName, @RequestHeader("clientType") String clientType, - @RequestBody List list + @RequestBody List list, + @RequestParam("pwd") String pwd ){ - return payService.returnOrder(list,token); + return payService.returnOrder(list,token,pwd); } From 81158431c81e0bcfdd6edd50bd2d5f715d25656e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Thu, 11 Jul 2024 14:23:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/PayService.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 84d47be..0e55f03 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -113,6 +113,10 @@ public class PayService { private String callBack; + @Autowired + TbmerchantAccountMapper tbmerchantAccountMapper; + + public static void main(String[] args) { System.out.printf("%.2f%n", new BigDecimal(1).setScale(2, RoundingMode.DOWN)); @@ -718,11 +722,30 @@ public class PayService { } @Transactional(rollbackFor = Exception.class) - public Result returnOrder(List list, String token) { + public Result returnOrder(List list, String token,String pwd) { if (ObjectUtil.isEmpty(list) || list.size() <= 0) { return Result.fail(CodeEnum.PARAM); } + + + String accountId= TokenUtil.parseParamFromToken(token).getString("accountId"); + + TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); + if(Objects.isNull(account)){ + return Result.fail(CodeEnum.ACCOUNTEIXST); + } + + + if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ + return Result.fail(CodeEnum.PWDNOSET); + } + + if(!account.getPwd().equals(MD5Util.encrypt(pwd.concat(account.getAccount()).concat(account.getId().toString())))){ + return Result.fail(CodeEnum.PWDERROE); + } + + Integer orderId = list.get(0).getOrderId(); String remark = list.get(0).getRemark(); @@ -732,6 +755,11 @@ public class PayService { return Result.fail(CodeEnum.ORDERSTATUSERROR); } + + + + + List orderDetails = tbOrderDetailMapper.selectAllByOrderIdAndStatus(list, orderId.toString()); From 2a28151139341cfbdad91b730b3e350cff1116ec Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Fri, 12 Jul 2024 10:23:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=9A=82=E4=B8=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/PayService.java | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 0e55f03..12f6e38 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -726,24 +726,22 @@ public class PayService { if (ObjectUtil.isEmpty(list) || list.size() <= 0) { return Result.fail(CodeEnum.PARAM); } - - - - String accountId= TokenUtil.parseParamFromToken(token).getString("accountId"); - - TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); - if(Objects.isNull(account)){ - return Result.fail(CodeEnum.ACCOUNTEIXST); - } - - - if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ - return Result.fail(CodeEnum.PWDNOSET); - } - - if(!account.getPwd().equals(MD5Util.encrypt(pwd.concat(account.getAccount()).concat(account.getId().toString())))){ - return Result.fail(CodeEnum.PWDERROE); - } +// +// String accountId= TokenUtil.parseParamFromToken(token).getString("accountId"); +// +// TbmerchantAccount account= tbmerchantAccountMapper.selectByPrimaryKey(Integer.valueOf(accountId)); +// if(Objects.isNull(account)){ +// return Result.fail(CodeEnum.ACCOUNTEIXST); +// } +// +// +// if(Objects.isNull(account.getPwd())||ObjectUtil.isEmpty(account.getPwd())){ +// return Result.fail(CodeEnum.PWDNOSET); +// } +// +// if(!account.getPwd().equals(MD5Util.encrypt(pwd.concat(account.getAccount()).concat(account.getId().toString())))){ +// return Result.fail(CodeEnum.PWDERROE); +// } Integer orderId = list.get(0).getOrderId(); @@ -755,11 +753,6 @@ public class PayService { return Result.fail(CodeEnum.ORDERSTATUSERROR); } - - - - - List orderDetails = tbOrderDetailMapper.selectAllByOrderIdAndStatus(list, orderId.toString());