From c5de12d144469906419e706f6a08d05fb308855b Mon Sep 17 00:00:00 2001
From: gaomusan <1929829500@qq.com>
Date: Wed, 19 Mar 2025 14:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BA=E5=B9=B2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AlipayController.java          |  13 ++++++++++++-
 .../controller/BusinessController.java        |   5 +++--
 .../controller/CommoditiesController.java     |  17 ++++++++---------
 .../Commodities/CommoditiesDeleteRequest.java |   2 +-
 .../jiaqingjiayi/service/AliPayService.java   |   4 +++-
 .../service/impl/AlipayServiceImpl.java       |  10 +++++-----
 .../controller/AlipayController.class         | Bin 20427 -> 20673 bytes
 .../controller/CommoditiesController.class    | Bin 12517 -> 12082 bytes
 .../CommoditiesDeleteRequest.class            | Bin 1958 -> 2404 bytes
 .../jiaqingjiayi/service/AliPayService.class  | Bin 310 -> 358 bytes
 .../service/impl/AlipayServiceImpl.class      | Bin 7509 -> 7351 bytes
 11 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/AlipayController.java b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/AlipayController.java
index 1ac2569..1ac67fc 100644
--- a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/AlipayController.java
+++ b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/AlipayController.java
@@ -146,6 +146,17 @@ public class AlipayController {
 
 //        User loginUser = userService.getLoginUser(request);
 //        String miniOpenId = loginUser.getOpenId();
+        String privateKey = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC7rWG3si4XQlDEHjSe/ot98aCn/R25fCSiCBIUTTA6Wy3Gs5lk1XERw1N6loq8u9zR8vTQwzLnFmepwJx2sMLHGfJT3F6Y7Lx0z7gLYksMe+LIAfc+KYsfs0IyDvoKvwsm7XAzl8AYiqk1/p2dxc5etdvkLO7bXquyCDOclR3lL9NBgbJ6tH0fvcVd3RPmZk5Tb2hfn5JK1s/tAanbvFtKhLNCwX8qZp25+AfPakx2tRZkSgjh+fjA6ZElUnwq9ftHy16vfSmnX3C3LuDSKduo3EBkDhpGjTD5+zOs8tKGofW2gn347ouzXWnTz71ftzVwAgFUcOh4Ib0GVC9SKZBrAgMBAAECggEBAJEK8R8/tEFDfhnjYjWScYm3KLtLciJ8n+8dn6NS+DfRabJL8PutvUHGHAj8uWIdKg6T3sJMaVWQyjK16fYMq6umENLg17cGFquMMSeTIn8Wa3C5nDPNdXjdWAZJ7tJJTTwbeoBVAh+1YgqZqYRacCBgGf3hAARHyRfBIOodkEojc4oyzlbUGOz+Ee6/b+A9BZd84YWkbg/KlD9mlqSAYSGCKBM9nd8l1YIvr/4OgBn679x+A8pB8i5kGxP4fertZl2mkt75LigJ3Ab/vwoHDj1AuPjlUIce+PcTdxHqgNtIJSDWbop70BGPp0XQE9BRefPIPQfS9+2LO+eFeo4ESeECgYEA+DzH4cLoMYG9Hfq9IIbQyq6VJeip4/Lbv8h4RevGPHqyFIKB3fX7bHRlBB8hCnyX+zj4T/K50LEoZmo4tpVCv7YmRkyGRoF0QwaMgbo3bkaaCZeQnuPeZFaqyhszcJL1nhLghSNKcU75orStqf4H2mLL67VH1PkjelAWMrY1JVsCgYEAwYvMNzPkLG+p9MqGlkxgu2gQ6F4SdQp35XLHjygyTMG+qt/cPAbviyOILUhTLHP1s++kgw7z/qJPcNCQVVMWL6aBM40aRb+FiMajHouGe/q26zuDdtgsuqoN84/9phs7495Oa8ROxu6eZPuvU+OJNCgf/NMVkURbOpXtbe+yXjECgYBZwhiAQGqW5BOO0IgsR7MdZm0VrQApJTpiKUmb9rnSSocztVDiAjysJZYVHHBlC1IlC591wQ2BMV2rUoM5OdVN3r4OM0NmIQ754VdS3ROH801lZIFtgnV6kH/m3lkGPo1DYA4A9hbHy8emFnCpA+qxA4I6s2zKzF8Qrf6ozYt/+wKBgChyjrr6nTSsIViG+pluXMjNdrsY7cKH7YaF9i50uA5SbwZGwj/JM0ZgppTQCJHBqhdwfXDmLxeH1BI/g+pQ8tICef3L/zGUVNPAr1Yy0mgWfSOrzE2J388iuserz9Zm2p1EWB8tZ0krlO6Fqp5dbs73k7fCZT92iZo0uum+rggBAoGBAIO74oQpY3lY6OgvjZJAHcr9RiGPB7qQ+zmROxCqzFXdtNZ5sHb1Jdg+IsBcI7ZadFT28x/ENNpfO78mC+1j56mmN9BUpORBIcCaEzp2KYgP7e4FnWTluMvFV/2yBMlCfUEYHPfPK1TfD05oBJY4lTMD2qsT5RhS1ipFqagZgQ1X";
+        String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo9gmNSz8l/eH4Uem6hqNoK1t91Gu5evoooJKzZraxPYW9AyJwH8Mxbag3qVaRSalz+OIHHVqszUxah98DbvaxJbpY9tB2zaLSvxhXM4U5iGFR3TqdqqvxsXsfiu+a0JHauuGYtuuNmUwR7ZFVub8Ma/YBCHfELPvl1TcX8MgMlHqw3NQqcEXZZO8Ziyxel7CqgHDx5dFn1meHDFWTajbWN/0TWSzvYAOKrlrS3LjjwbDzTr3BQzH84TLbLkBaMVGEUkJZUrVVkiN3XEVBpBUs5Cv5INN4L+UJ4kDy1u6LICzUVSSrQmHItuA+YiFHZ/WVJ18jISn0W7YZVyRqTo2sQIDAQAB";
+        AlipayConfig alipayConfig = new AlipayConfig();
+        alipayConfig.setServerUrl("https://openapi-sandbox.dl.alipaydev.com/gateway.do");
+        alipayConfig.setAppId("2021004144652242");
+        alipayConfig.setPrivateKey(privateKey);
+        alipayConfig.setFormat("json");
+        alipayConfig.setAlipayPublicKey(alipayPublicKey);
+        alipayConfig.setCharset("UTF-8");
+        alipayConfig.setSignType("RSA2");
+        AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig);
         User byId = userService.getById(pay.getUserId());
         ThrowUtils.throwIf(byId.getOpenId() == null, ErrorCode.NOT_FOUND_ERROR, "不是小程序用户");
 
@@ -158,7 +169,7 @@ public class AlipayController {
             throw new BusinessException(ErrorCode.NO_AUTH, "你不是该订单用户！");
         }
 
-        String tradeNo = aliPayService.createPayment(String.valueOf(order.getId()), byId.getOpenId(), order.getTotalPrice());
+        String tradeNo = aliPayService.createPayment(String.valueOf(order.getId()), byId.getOpenId(), order.getTotalPrice(), alipayClient);
         log.info("tradeNo:" + tradeNo);
         return ResultUtils.success(tradeNo);
     }
diff --git a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/BusinessController.java b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/BusinessController.java
index e6892c1..51e177b 100644
--- a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/BusinessController.java
+++ b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/BusinessController.java
@@ -219,9 +219,10 @@ public class BusinessController {
 
     @ApiOperation(value = "获取当前登录商家")
     @GetMapping("/current")
-    public BaseResponse<BusinessVO> getLoginBusiness(HttpServletRequest request){
+    public BaseResponse<BusinessVO> getLoginBusiness(@RequestParam Long businessId, HttpServletRequest request){
         //获取登录态
-        Business business = businessService.getLoginBusiness(request);
+//        Business business = businessService.getLoginBusiness(request);
+        Business business = businessService.getById(businessId);
         return ResultUtils.success(businessService.getBusinessVO(business));
     }
     
diff --git a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/CommoditiesController.java b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/CommoditiesController.java
index 441a829..d29525b 100644
--- a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/CommoditiesController.java
+++ b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/controller/CommoditiesController.java
@@ -67,9 +67,8 @@ public class CommoditiesController {
         //校验
         commoditiesService.validCommodities(commodities,false);
         //添加商家id
-        Business loginBusiness = businessService.getLoginBusiness(request);
-        Long businessId = loginBusiness.getId();
-        commodities.setBusinessId(businessId);
+//        Business loginBusiness = businessService.getLoginBusiness(request);
+        commodities.setBusinessId(commoditiesAddRequest.getBusinessId());
         //保存商品信息
         Long commoditiesId = commoditiesService.addCommodities(commodities);
         //中间表中添加数据
@@ -93,8 +92,8 @@ public class CommoditiesController {
         }
         Long commoditiesId = commoditiesDeleteRequest.getId();
         //获取商家id
-        Business business = businessService.getLoginBusiness(request);
-        Long businessId = business.getId();
+//        Business business = businessService.getLoginBusiness(request);
+        Long businessId = commoditiesDeleteRequest.getBusinessId();
         //校验商品是不是当前登录商家的
         LambdaQueryWrapper<Commodities> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Commodities::getId, commoditiesId);
@@ -127,8 +126,8 @@ public class CommoditiesController {
         //校验
         commoditiesService.validCommodities(commodities, true);
         //添加商家id
-        Business loginBusiness = businessService.getLoginBusiness(request);
-        Long businessId = loginBusiness.getId();
+//        Business loginBusiness = businessService.getLoginBusiness(request);
+        Long businessId = commoditiesUpdateRequest.getBusinessId();
         commodities.setBusinessId(businessId);
         //更新商品
         Boolean updateDishes = commoditiesService.updateCommodities(commodities);
@@ -155,8 +154,8 @@ public class CommoditiesController {
         }
 
         //获取商家id
-        Business loginBusiness = businessService.getLoginBusiness(request);
-        Long businessId = loginBusiness.getId();
+//        Business loginBusiness = businessService.getLoginBusiness(request);
+        Long businessId = commoditiesUpdateRequest.getBusinessId();
         //更新状态
         UpdateWrapper<Commodities> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id);
diff --git a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/Commodities/CommoditiesDeleteRequest.java b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/Commodities/CommoditiesDeleteRequest.java
index 4b7eab2..d160ed9 100644
--- a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/Commodities/CommoditiesDeleteRequest.java
+++ b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/model/request/Commodities/CommoditiesDeleteRequest.java
@@ -15,6 +15,6 @@ public class CommoditiesDeleteRequest implements Serializable {
      */
     private Long id;
 
-
+    private Long businessId;
 
 }
diff --git a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/AliPayService.java b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/AliPayService.java
index 2fa436f..2cdd2a5 100644
--- a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/AliPayService.java
+++ b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/AliPayService.java
@@ -1,8 +1,10 @@
 package com.cj.jiaqingjiayi.service;
 
+import com.alipay.api.AlipayClient;
+
 import java.math.BigDecimal;
 
 public interface AliPayService {
 
-    String createPayment(String orderId, String miniOpenId, BigDecimal amount);
+    String createPayment(String orderId, String miniOpenId, BigDecimal amount, AlipayClient alipayClient);
 }
diff --git a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/impl/AlipayServiceImpl.java b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/impl/AlipayServiceImpl.java
index 455950a..e5eea1f 100644
--- a/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/impl/AlipayServiceImpl.java
+++ b/project/jiaqingjiayi/src/main/java/com/cj/jiaqingjiayi/service/impl/AlipayServiceImpl.java
@@ -2,6 +2,7 @@ package com.cj.jiaqingjiayi.service.impl;
 
 
 import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
 import com.alipay.api.domain.AlipayTradeCreateModel;
 import com.alipay.api.request.AlipayTradeCreateRequest;
 import com.alipay.api.response.AlipayTradeCreateResponse;
@@ -37,9 +38,9 @@ public class AlipayServiceImpl implements AliPayService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public synchronized String createPayment(String orderId, String miniOpenId, BigDecimal amount) {
-        //创建客户
-        AlipayClients clients = new AlipayClients();
+    public synchronized String createPayment(String orderId, String miniOpenId, BigDecimal amount, AlipayClient alipayClient) {
+
+
         //AlipayClient client = clients.alipayClient();
         //创建交易请求
         AlipayTradeCreateRequest aliRequest = new AlipayTradeCreateRequest();
@@ -71,7 +72,6 @@ public class AlipayServiceImpl implements AliPayService {
         model.setTotalAmount(String.valueOf(amount));
         model.setSubject(subject);
         model.setProductCode("JSAPI_PAY");
-        model.setSellerId("2088721034640726");
         model.setBuyerId("2088722034659383");
         model.setOpAppId("2021004144652242");
 
@@ -80,7 +80,7 @@ public class AlipayServiceImpl implements AliPayService {
         aliRequest.setBizModel(model);
         String trade_no = null;
         try {
-            AlipayTradeCreateResponse response = clients.alipayClient().execute(aliRequest);
+            AlipayTradeCreateResponse response = alipayClient.execute(aliRequest);
             trade_no = response.getTradeNo();
             if (trade_no == null) {
                 throw new BusinessException(ErrorCode.NULL_ERROR, "未获取到trade_no");
diff --git a/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/controller/AlipayController.class b/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/controller/AlipayController.class
index bbaeaa0518680aced64fb40e911b4be8deaf0aaa..2b3edef3f33d3401ad5e5117a085c346fa9cf335 100644
GIT binary patch
delta 6493
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

delta 6185
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

diff --git a/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/controller/CommoditiesController.class b/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/controller/CommoditiesController.class
index 83d5e656ce05e4a112fe97e17112d27f23e1e3a3..c7fcdee464ad6bfcc8677038831ce3d52730dc14 100644
GIT binary patch
delta 3821
zcmaJ@3tW^{7XP1_Z{{0jE;BHQI6?+0#v{Z>NsfXjP@)I~0s;9LWkeLg7_ic6Dj#Xt
z!@XAOvZmQ<Yx5m~wwha8ZTqNgx2$c~wcV(;_SLqv+osvM-!~wdzh#(j&OP_u^PT(u
zpU3SD?4Rp=?VH0#0p!v>`<!vsXeUM^TgMoIu^1=MYSTq@W3YW%N2sYK7z)W*TB7|5
zfh#dVwrCmls{|&(FSl#ej?tJbkc&K7WE*487nq7^a+Ph7yAVY>t`@ik(+QL1ar+>7
zuhk)s+LC3aJ>NY8Gj)^*%t9$)6i+A0&Gs5sIj+@FAyCOqd}c3>BiPuD;sz(mm3!5M
zsd7_Nx;#2$h{uU4SiO9PT7f#$%Lnx7jw;L%n2UMxlwRnnbs-H41Qwz}W;?1A7YQ`N
zP4JYJ7gbE1U0hZ=uc)G;tipjNxx<m}UW#TN%LH1`N=P$Y{?rk$-yqP2kgSNxj9!Wk
zHNAq6kya;TE%EY^sCY*qZW6eep?N-Ph{K6h%F|oe{mF8N)8k0PZ31E3E>A|yt-e!W
zHP#Tsg4WjNV4$Ts(A*IuSkuz$obcjWwR^G)g;+1JK_M64vAiMB9-MY_LF=+*tqo1>
zO~H_YW0kpfqrknmPo8w9x*otL9p4j>*eu<y%3%))JZzk{v~2dgtIMiN3(eE&*h<J{
z6mzFLu?1EKIti90wz&m!9C(D_To9qXxWR#)1be7G(B2VJ3w8-ShI#C8DA=yheL~<#
zJS8<z;C>p<==hPqv)D~2lJAQmxlP0;KaITt`;^YbOqK^4gOyDygKF;qfrEHXzAm<C
zhlrzTQ<6`<IxHp0i7xaA*l?KHPn$6#y;`k)Uf{<#Dvw8Zx?aF>9X}Cx5xeDLcgiI{
z6?j>l)LB|pQeqxb?RZt-XLwCM;htpwg}^WIEBTSTeZ(6C?+4xY_CC9%xAUow_dMSF
z;JRLUhZAq&H#&YR@D{^)o5$}ufp>JgEATtKCtvi8a*cK31WpS45vQaUGa|iGZTYjn
z2Y8PVtAcdd^5$8=_QkCYGn-l%%{TF(z(;JYJSLg`B5#PvbDdP$zY6?~wTEL;UCjBL
z_@}^UJpLpm!}d9+LYmx3ankMZ7OBZE1ir+5950a<6f_4yAqV2r+*bnsQ*(pQdwFG3
zV+*s@7Ia{ojx%y~>?jM)%4cGSkH%>t#+57_R%s<m0xJU9&4HH2?8^4Grk2J@>D5ls
z$flEBkWLQyb!>&*Dab`aR(fk>x;6j6Q{Iyly>MV8%HxCL4}3Uii&btIa#EW_NR{*B
zQV%@f>(#XdoF*IxL*?m|m;<{~wpzsJ9vjxi(9MKtX)^Yb(Q?Je<b+#Q<Y#;A6n4_>
zbcarN3R+ET<o=OwXm=@t`%;HFN0zj<F6~&Z(+0UaH7CqYapGHWDUv}H&9a?;-AYFu
zin&mys?r6zC~$NcyJC4)HjjvZZ5f9^`wTOxvanHprc)e0g}HzRQ9KgBgNZbl!Bo4y
zfR&d5b@EhtitHQ}70$}+LRJ^XXB<RgRu6J4@N2A^<hQYAicj;|dQf0Rjn<8nZWQn3
z%^ImUX28kMJZP8#54)Yfjwf+F$lyXc4#hk(lSd_}z%0Y7JoCkdSG*B*lt4oeR&Ljk
zkA^Zv2`HdMN@5@LkVKczFg9L@!E`Alv;Qf)QXS3I3}?*<)>y$Xj$|RqLh7(S{-*NK
zLZb|{N5D##F`{W9N~a7Z)Pq8lNtd&nRUZZ|q|uaZ7+}p97T5xfrEw-?w3J`rVBN;d
zSKvMZy>>sM4#9JbK`JZd$85iL1XZ<%P~*4xY=?0j6rR`DD0x2M)6_trtB?#>@B+Mk
zyU+d#bnQuKVe5Vby^FiCBtpP)3nu9C`ZjY~&32<*QNiTgXu)@Am;e=1b&OO!(=Z2v
z_@zU!03*1WWTOF-5o8h;ajRL3C1}D*EX5i$8<bSQ5mqPb=VT*|rz?!;*%+Z@5N<Mv
zu(HuMF1d=55on?-X#xjj3GxlX>}+~C<<M2o`)M*)O^ncV8El@jD1xpdNk_R(ejP9H
ze^^JA&RNBVPBZ8E)W_xc^SGRRA(y!WxXg=id2uQ^#HK{3%!yFhc8*H<NqTaaSzPJY
zvJ_Q)d2lP|0n^!qJI-f<sa@;0^M-YP-AE9-Pw&B9R-Bg`<2X>kjaFm0J-CGf`&Q14
zFz3dd7{h&a0@iZ2tmA9JdZsPB0Ri0I#|Uq1>nEg*5t(Wb($=3N^^qJI!zN5ZreO?C
zqXH(R9tj3rcD5L6<jpxkOwDknNaal|te$U>$Jpy(#l-M)(C42Aec^@B7Y%^^>i-Kp
zUDFS}o1xeFweuOeyH(oU!+^gGmyZKFeE-(I%z7}ASu6dvBiO=8wN2%U_xlX{4{BK0
zt|&329g3|-&BU_z;BgBxaIpgQ5To)iTzn%)z*Y>$cJ8-3`0BV5emu&xWEV=qc+3EQ
zy6Is*`1AY0pC18V0o=(sU}b|<eBqeR45#5Lg9aNL&8A|S0egQAn3|caQIHE*&LF{v
z`xDN-IA^fK1B#Z3b^@2LNYN@8fcC8K)~Qk|GlLt)*n3r{av0nnPUXj*98J}f%pUCL
zV74py2)b&M2WyAW?PJW2Sh*N=`Sq|*k3_H4sO;P<*v=k)?&WjtXW$O<*`6Cv#dG>G
z%As<)mIKs=aa2K-T*O_toMyA6@xElP6IERI$1(z?R2``fgN;(J=4y<&u$sJ%Csi4@
z5tVcNnI*i|h`j-5)D1wR-atd=c4$;>qU&i+1dDzAc8!e{Fbv0{Hh1<H)0fO*sz7<g
zD8;iFmT=<bJ@~l=rCE`p%vJX#@9SKXvo3<mTU=t_=0G}uEWE>w>Rkhu4D)^cxD*(1
zLcA`8=5kB3@an-dkLGhbQn3&NEjpjhU=%0dLY)GU?6VO%`%k~{!qYcUkPmA%utn!i
z-^k{iw3wQBlAAnNVJm-tFEhIE>k>;YgYdS@$W9FZz6*cYia2ZTlW=Ex-#11!EjQ^I
zUX0!RwJ3rAhVoZ6<_5O#C&v!l&%eFikGt^6R;*_EQ}5pm`9_xi;r*8(FJ<}P-v1c#
zJeL3K{o0T#jW)QKHDP6{h=o2=6It#vmBn(OsT7v`OvSU@XDZ6*u6vK*bglOrzKI`W
z7tN40uRo~<73THlOIpIM8wS{3*w0`j*SQlE?Hu|wiofFfiG!Ls`V7R7Vw{%m5Z<J2
zvL2u)b+IBN86uYX(zA?p7HTm_;SxZtykfa=nYe-4czKA&CO7TW!E1-{>f1OVSI~`g
a6Ro6G!y?05%ptAiMNZzdj@HxN@O=yXQ_pn(

delta 4079
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

diff --git a/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/model/request/Commodities/CommoditiesDeleteRequest.class b/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/model/request/Commodities/CommoditiesDeleteRequest.class
index 1bc789c27b1d3121885a63ad1a856bfcd36936b2..460b20e8ccaa3d6757db58616352abebf3cfcd0f 100644
GIT binary patch
literal 2404
zcmb_dU2_vv7=BK&n@z)}4TS=+fFMQtNkoy4rbVT+HkblZs55%wX?mvFcDq}4H_V`S
z{s(6qe}LR@p)(3ITsV4zGyVpDhL<8fXLs9dAv#_-lbnzDydTf|yze>t+h0$90x*k}
z5^~5}Fl?A82vj!YJy~<5w_dxkx}jQ;Kw-x5oanMZespZ54@LA@DB0KtTVSE(Z`E2G
zwGBt!b-Z;>_nq37zoy(;pzd~57}e(dEef2-QDJs{Rk<osw-P0RoU_K@&2IFj@2%H$
zw0;`{I#g-36FQy>!^T>P;{7%TaX_HhlHUB?j&ucvMl<#a`uf->T6xIEAsiMk*HzSD
zpuy3xjA|T8^H8<%iuPF`D(QyW@~Dkt+OkZ`D;WSeylUeFP7**{hV40~923+SB(0}x
zjNr7u;VrqT=6tUuqmP}4N?sUAFA4?DWueCLU&NCIxEuu}w{GDLfrBwcj$d0=fg@e#
zbGhm=bR~?pD=G*b-@DVeDj=>A_D;+d>2{R)#mrY_@5?)91&jpoK$DbS?`*BA;CA9@
zu<5s?yCUhFj#Hr#wH=~fZ2mvxuCo$hQi%gE5iz#HY?f5i_SbI8KyI;10>&=Wpj!ZD
z=d+9%($ad<vmdopAYf_CBf71Mu_Rs&#KLYTF;sGx6_uAG+1gx^+iCXZ&0CG7d4_DT
zH3AiOT;7U&>~G&l*031)NvT+-Jsp-7kWIYocY>B$aCFU%Wv<4a>u^Tbn9#2HeiTN5
z+)n5Siy(r@f3g~N)@H@zi7ud7F*Z=Zhb1(zWZ}AQ${PYB-8<%Z_xw#&OVA~Kx*%JT
zAKVxCI$M}jF@doty){>bBTe7m>}=OFHAvIUNcI@szQ3({sDGN#-?_CJQR-q&y6&<Q
zDfW)t@H`dFxiSn@XyKN?>6dcq1=YfBf#d(K$_giW;UsT=4g#+u&sSj-V_c8(a_2C?
zKVQFi&8LZTAJ6!Fa-8C>##wMS#~(v{AFG|=sE<LXHI8<ofH!fLJE31Ej(d%Nfb|^@
zbLbjZdK&YA>S0`d(Ri?@@mqMCA#~(v&N<G7@rfT{^~QZD(MWOYoHP-9&uC`~ZYtco
z)7xeFzq-_%?z$X^UGiB@QU1Z%Vzl<e__r{PhZDb`_zleb!-=0!T$&tzgi5^S;^6g3
z4%5ceuh>^Lo?`z4*i%*G5svI=3{RU>8J;dwO|4USiopjcSIuf+N6C1|Sour|lKL$s
z7<PGR<2)`9^bnSDku}Znu3g0?%JOWQ%jEU~41B<*s&i#x3B#D-s=!Y$_#Nr9ihrWt
zLh%_6S;+BM6wh!ZS@!Lcah_xt`n#8safu;y$xO|HMw)Gw1Zh$+a~G*ed>Uz5v5PUi
z{E$(ko8Wi4FgZ_G>NCb{Oybc>y-f;>m5B$irXJz=XIefyZRmrlk)9Mau{=83o3L|<
z*Azyc5H90g#x&V2?{SqwiD&Oqp2sQn^A)a)n4D`co>O3u93e;ugm_M+?mnjlLojy~
zc65xrBC0Xo9LthqdQrP#ru{leozN4!2E2G_ve&hL7yW!p^#Tj3FSNil{ugnRyAoF)
Ju?g;=`ZqaL=oA0|

delta 923
zcmZuwOK%cU6#nka9U#+D1}a4=P-$&=TdP=YDZcPkUkewyFfpQ%;ETq9YyN^bI}^9<
zhM1ZdG>tLpLXC-uiGRVr;6fM1@6I4m!(#3^_ug~A$KmiTycRS+{n~sDpn`K<^NDF9
zfUOpSu)81AzOaRHZ0mkcU7WBGg)QK#-+xfM+cKdcW?>RL1Okm(t5IFOSr^bV*_ANC
z5*Ct}5{TZb-Kkesn>T9h%eUGrYPQ<7X1gV@E8{#8vm)iZ6hEDJ+JckN^Ufvxx;!k9
zbYAI+a5m_}Q4_~d_2an0JK_A$zlzh&XPJ{{RMi)mbYe!hvy);bF^w4zm+Ts5`HjJ1
z?&p~SAJ;T@bBuz~$i0Ag=9Xr-s%y}AmaF9zAcs76Liy+V@8jq2Z}3us`*_-YVUK)W
zK#^r>C*+HE{%4xtjpFv0RHh^g?B=N<xUsom(-i=ZHW&@YYCg9HL-z7-5qJzk@8#bh
zaK4c1V~e|G61q^}vLuTiFcy>V5n6{;yc&~zMBEbDBaZH=cg1_wOCJ7EP?i1K!}|y&
z&9faEyE}!wJkwbd!#-vbC1OS3bGrWV&L8b_R4vsI4YV&3MVU2}Xhl9~-CyKhH;f^<
zK}tnF=*GO;4bB^nR5u<HLNZR-<z-oMJ;&`U<pwPW?EE_X#Xh!QtHeh;&3SJJWIE#5
zj|CzdoTCHGG??^s&~>W(%|LUW22!_KvWTUDgc75g8&k1w5`#a{C}-Y8nM1O&TeZx8
VoSHd-Bm55Gq(WkL3M)8^*l%)wXW;+<

diff --git a/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/service/AliPayService.class b/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/service/AliPayService.class
index 2a93feb75c63d50432368b0dc0d0add026ef26fb..bac11b45a40523f1b3f667250206cfe064f57f6e 100644
GIT binary patch
delta 99
zcmdnS^o)t?)W2Q(7#J9A8Tcl0g)?SPOtO~oNzTvJPt3_INUYRPEXdS%1T&p;GE?(P
nCeHEX=7Gq81SUSTl@VlN-~gJy3B+7L%nihh3_L)RiGddYUzi#j

delta 55
zcmaFHw2g`D)W2Q(7#J9A8F(jhg){n1OtPN1%VV-2qoo8dGXn=uh7*XnfS8ei8%Q!S
G@Bjd;eF|~_

diff --git a/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/service/impl/AlipayServiceImpl.class b/project/jiaqingjiayi/target/classes/com/cj/jiaqingjiayi/service/impl/AlipayServiceImpl.class
index b73de3adf6e98d43a8002184734e53de1a523b99..3844080d54add007d32bfd67494b906c476a1c6a 100644
GIT binary patch
delta 2717
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

delta 2810
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