fix(app):

1.bug修复

national-motion-module-system/national-motion-system-biz/pom.xml

@@ -46,7 +46,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.redisson</groupId>
-			<artifactId>redisson</artifactId>
+			<artifactId>redisson-spring-boot-starter</artifactId>
 		</dependency>
 	</dependencies>
 	

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/OrderController.java

@@ -15,16 +15,16 @@ import org.jeecg.modules.app.service.IOrderService;
 import org.jeecg.modules.app.vo.OrderVO;
 import org.jeecg.modules.app.vo.PageOrdersVO;
 import org.jeecg.modules.app.vo.QueryOrderVerifyRecordsVO;
-import org.jeecg.modules.pay.vo.NotifyRequest;
-import org.jeecg.modules.pay.vo.NotifyResponse;
 import org.simpleframework.xml.core.Validate;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Tag(name = "APP订单相关接口")
@@ -133,9 +133,9 @@ public class OrderController {
      * @return
      */
     @Operation(summary = "支付回调")
-    @PostMapping("/orderNotify")
-    public NotifyResponse orderNotify(@RequestBody NotifyRequest notifyRequestForm) throws IOException {
-        return appOrderService.orderNotify(notifyRequestForm);
+    @PostMapping("/wechatPayNotify")
+    public Map<String, String> wechatPayNotify(HttpServletRequest request) {
+        return appOrderService.wechatPayNotify(request);
     }
 
     /**

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/form/QueryByOrgCodeForm.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.app.form;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "查询表单对象")
+public class QueryByOrgCodeForm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "部门编号")
+    private String orgCode;
+
+    @Schema(description = "类型")
+    private Integer type;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/IOrderService.java

@@ -11,9 +11,11 @@ import org.jeecg.modules.app.vo.QueryOrderVerifyRecordsVO;
 import org.jeecg.modules.pay.vo.NotifyRequest;
 import org.jeecg.modules.pay.vo.NotifyResponse;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public interface IOrderService {
 
@@ -95,4 +97,6 @@ public interface IOrderService {
     IPage<PageOrdersVO> pageOrders(PageOrdersForm pageOrdersForm);
 
     String refundOrder(String orderCode);
+
+    Map<String, String> wechatPayNotify(HttpServletRequest request);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/WeChatPayService.java

@@ -158,6 +158,7 @@ public class WeChatPayService {
      */
     public Map<String, String> wechatPayNotify(HttpServletRequest request) {
         Map<String, String> result = new HashMap<>(2);
+        //验签及解析返回数据
         JSONObject res = wechatPayV3Utils.getCallbackData(request);
         if (res == null) {
             result.put("code", "FAIL");
@@ -170,110 +171,7 @@ public class WeChatPayService {
         try {
             String out_trade_no = res.getString("out_trade_no");
 
-//            BmsFilmOrder bmsFilmOrder = bmsFilmOrderService.getOne(Wrappers.<BmsFilmOrder>lambdaQuery().eq(BmsFilmOrder::getSysOrderNo,
-//                    out_trade_no));
-//
-//            if (bmsFilmOrder.getOrderState() != 1) {
-//
-//                String payer_total = res.getJSONObject("amount").getString("payer_total");
-//
-//                String openid = res.getJSONObject("payer").getString("openid");
-//
-//                Date successTime = dealDateFormat(res.get("success_time").toString());
-//
-//                String orderNo = genOrderNo();
-//
-//                BigDecimal paymentMoney = new BigDecimal(payer_total).divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
-//
-//                BigDecimal amount = bmsFilmOrder.getAmount();
-//
-//                if (amount.compareTo(paymentMoney) != 0) {
-//                    bmsFilmOrder
-//                            .setOrDiscounts(1)
-//                            .setDiscounts(amount.subtract(paymentMoney));
-//
-//                    BigDecimal discounts = new BigDecimal("0");
-//
-//                    String discountsName = "";
-//
-//                    if (ObjectUtil.isNotEmpty(res.getJSONArray("promotion_detail"))) {
-//
-//                        JSONArray jsonArray = res.getJSONArray("promotion_detail");
-//
-//                        for (int i = 0; i < jsonArray.size(); i++) {
-//                            JSONObject jsonObject = jsonArray.getJSONObject(i);
-//
-//                            if (ObjectUtil.isNotEmpty(jsonObject.getString("amount"))) {
-//                                discounts =
-//                                        discounts.add(new BigDecimal(jsonObject.getString("amount")).divide(new BigDecimal("100")).setScale(2,
-//                                                BigDecimal.ROUND_HALF_UP));
-//                            }
-//
-//                            if (ObjectUtil.isNotEmpty(jsonObject.getString("name"))) {
-//                                if ("".equals(discountsName)) {
-//                                    discountsName = jsonObject.getString("name");
-//                                } else {
-//                                    discountsName = discountsName + "、" + jsonObject.getString("name");
-//                                }
-//                            }
-//                        }
-//
-//                        bmsFilmOrder.setDiscounts(discounts)
-//                                .setDiscountsName(discountsName)
-//                                .setDiscountsContent(res.get("promotion_detail").toString());
-//                    }
-//                }
-//
-//                BmsEnterprise enterprise = bmsEnterpriseService.getOne(Wrappers.<BmsEnterprise>lambdaQuery()
-//                        .eq(BmsEnterprise::getName, bmsFilmOrder.getEnterpriseName())
-//                        .eq(BmsEnterprise::getCode, bmsFilmOrder.getEnterpriseCode())
-//                );
-//
-//                if (ObjectUtil.isNotEmpty(enterprise.getCode()) && ObjectUtil.isNotEmpty(bmsFilmOrder.getEnterpriseCode())) {
-//                    if (!enterprise.getCode().equals(bmsFilmOrder.getEnterpriseCode())) {
-//                        bmsFilmOrder.setEnterpriseCode(enterprise.getCode());
-//                    }
-//                }
-//
-//                //修改订单
-//                bmsFilmOrder
-//                        .setOrderNo(orderNo)
-//                        .setOrderState(1)
-//                        .setCostDesc(res.getString("description"))
-//                        .setTransactionId(res.getString("transaction_id"))
-//                        .setUserOpenid(openid)
-//                        .setPaymentMoney(new BigDecimal(payer_total).divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP))
-//                        .setPaymentTime(successTime);
-//
-//                bmsFilmOrderService.updateById(bmsFilmOrder);
-//
-//                List<BmsFilmOrderList> list = bmsFilmOrderListService.list(Wrappers.<BmsFilmOrderList>lambdaQuery().eq(BmsFilmOrderList::getSysOrderNo,
-//                        bmsFilmOrder.getSysOrderNo()));
-//
-//                for (BmsFilmOrderList bmsFilmOrderList : list) {
-//                    bmsFilmOrderList.setOrderNo(orderNo);
-//                }
-//
-//                bmsFilmOrderListService.updateBatchById(list);
-//
-//                //创建发票
-//                BmsInvoice bmsInvoice = new BmsInvoice();
-//
-//                bmsInvoice.setSysOrderNo(bmsFilmOrder.getSysOrderNo())
-//                        .setEnterpriseName(enterprise.getName())
-//                        .setSocialCode(enterprise.getSocialCode())
-//                        //.setItin()
-//                        .setEmail(enterprise.getEmail())
-//                        .setBatchNumber(bmsFilmOrder.getBatchNumber())
-//                        .setAmount(bmsFilmOrder.getAmount())
-//                        .setOrderDate(successTime)
-//                        .setSendStatus(0)
-//                        .setStatus("0")
-//                ;
-//
-//                bmsInvoiceService.save(bmsInvoice);
-
-//            }
+            //查询订单，判断是否已修改未已支付状态
 
             result.put("code", "SUCCESS");
             result.put("message", "OK");

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppSitePlaceController.java

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.app.form.QueryByOrgCodeForm;
 import org.jeecg.modules.jmreport.common.annotation.RequiresPermissions;
 import org.jeecg.modules.system.app.dto.*;
 import org.jeecg.modules.system.app.entity.AppSite;
@@ -165,9 +166,9 @@ public class AppSitePlaceController extends JeecgController<AppSitePlace, IAppSi
      */
     @AutoLog(value = "根据orgCode查询商户信息列表")
     @Operation(summary = "根据orgCode查询site列表")
-    @GetMapping(value = "/queryByOrgCode")
-    public Result<List<AppSite>> queryByOrgCode(@RequestParam(name = "orgCode", required = true) String orgCode,@RequestParam(name = "type") Integer type) {
-        List<AppSite> appSites = appSitePlaceService.queryByOrgCode(orgCode,type);
+    @PostMapping(value = "/queryByOrgCode")
+    public Result<List<AppSite>> queryByOrgCode(@RequestBody QueryByOrgCodeForm queryByOrgCodeForm) {
+        List<AppSite> appSites = appSitePlaceService.queryByOrgCode(queryByOrgCodeForm);
         return Result.OK(appSites);
     }
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppOrderMapper.xml

@@ -89,10 +89,10 @@
             o.order_type,
             o.original_price,
             o.price,
-            o.amount
+            o.amount,
+            o.address_site_id
         FROM
             nm_order o
-            left join nm_site
         <where>
             del_flag = 0
             <if test="pageOrdersForm.orAfterSale != null and pageOrdersForm.orAfterSale == 0">

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppSitePlaceService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.app.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.app.form.QueryByOrgCodeForm;
 import org.jeecg.modules.system.app.dto.*;
 import org.jeecg.modules.system.app.entity.AppSite;
 import org.jeecg.modules.system.app.entity.AppSitePlace;
@@ -117,5 +118,5 @@ public interface IAppSitePlaceService extends IService<AppSitePlace> {
 
     AppSitePlaceParkDTO queryPack(String siteId);
 
-    List<AppSite> queryByOrgCode(String orgCode,Integer type);
+    List<AppSite> queryByOrgCode(QueryByOrgCodeForm queryByOrgCodeForm);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSitePlaceServiceImpl.java

@@ -16,6 +16,7 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.app.form.QueryByOrgCodeForm;
 import org.jeecg.modules.quartz.utils.HolidayUtil;
 import org.jeecg.modules.system.app.dto.*;
 import org.jeecg.modules.system.app.entity.*;
@@ -928,10 +929,10 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
     }
 
     @Override
-    public List<AppSite> queryByOrgCode(String orgCode,Integer type) {
+    public List<AppSite> queryByOrgCode(QueryByOrgCodeForm queryByOrgCodeForm) {
         return appSiteMapper.selectList(Wrappers.<AppSite>lambdaQuery()
-                        .eq(ObjectUtil.isNotEmpty(type), AppSite::getType, type)
-                .likeRight(AppSite::getOrgCode, orgCode));
+                        .eq(ObjectUtil.isNotEmpty(queryByOrgCodeForm.getType()), AppSite::getType, queryByOrgCodeForm.getType())
+                .likeRight(AppSite::getOrgCode, queryByOrgCodeForm.getOrgCode()));
     }
 
     /**

pom.xml

@@ -232,8 +232,8 @@
 
 			<dependency>
 				<groupId>org.redisson</groupId>
-				<artifactId>redisson</artifactId>
-				<version>3.13.1</version>
+				<artifactId>redisson-spring-boot-starter</artifactId>
+				<version>${redission.version}</version>
 			</dependency>
 
 			<!--mongon db-->