查询自己的无需审核

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

@@ -53,7 +53,7 @@ public class AppEvaluateController {
         FindEvaluateRequestDTO findEvaluateRequestDTO = new FindEvaluateRequestDTO();
         LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         findEvaluateRequestDTO.setUserId(principal.getId());
-        findEvaluateRequestDTO.setCheckStatus(1);
+//        findEvaluateRequestDTO.setCheckStatus(1);
         return Result.ok(evaluateService.findPage(pageDTO.getPageNo(), pageDTO.getPageSize(), findEvaluateRequestDTO));
     }
 

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

@@ -1626,6 +1626,11 @@ public class OrderServiceImpl implements IOrderService {
                     log.error("微信支付成功通知成功,未查询到部门信息,该订单属于未知订单");
                     return stringStringMap;
                 }
+                SysDepart byOrgCode = sysDepartMapper.findByOrgCode("A01");
+                if (byOrgCode==null){
+                    log.error("微信支付成功通知成功,未查询到观头信息,该订单属于无法分账");
+                    return stringStringMap;
+                }
                 SeparateAccounts separateAccounts = separateAccountsMapper.findByDeptIdAndStatus(sysDepart.getId());
                 ReceiptPaymentDetailsInfoVo receiptPaymentDetailsInfoVo = new ReceiptPaymentDetailsInfoVo();
                 receiptPaymentDetailsInfoVo.setMoney(priceSum);
@@ -1654,7 +1659,7 @@ public class OrderServiceImpl implements IOrderService {
                 BigDecimal mdBigDecimal = priceSum.subtract(shBigDecimal).subtract(ptBigDecimal).setScale(2, RoundingMode.HALF_UP);
                 ReceiptPaymentDetailsInfoVo receiptPaymentDetailsInfoVoMd = getChangeMoney(receiptPaymentDetailsInfoVo, appOrder.getOrgCode(), appOrder.getTenantId(), 2, mdBigDecimal);
                 ReceiptPaymentDetailsInfoVo receiptPaymentDetailsInfoVoSh = getChangeMoney(receiptPaymentDetailsInfoVo, sysDepart.getOrgCode(), sysDepart.getId(), 1, shBigDecimal);
-                ReceiptPaymentDetailsInfoVo receiptPaymentDetailsInfoVoPt = getChangeMoney(receiptPaymentDetailsInfoVo, sysDepart.getOrgCode(), sysDepart.getId(), 1, shBigDecimal);
+                ReceiptPaymentDetailsInfoVo receiptPaymentDetailsInfoVoPt = getChangeMoney(receiptPaymentDetailsInfoVo, byOrgCode.getOrgCode(), byOrgCode.getId(), 0, ptBigDecimal);
 
                 log.info("支付成功消息通知,门店添加明细："+JSONObject.toJSONString(receiptPaymentDetailsInfoVo));
                 iReceiptPaymentDetailsInfoService.add(receiptPaymentDetailsInfoVo);