回调冲突

ldt-core/src/main/java/org/springblade/common/enums/CsFlag.java

@@ -0,0 +1,32 @@
+package org.springblade.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.kie.api.definition.rule.All;
+
+import java.util.Objects;
+
+/**
+ * @author lianghanqiang
+ * @version 1.0
+ * @description:
+ * @date 2021/12/22 4:57 下午
+ */
+@Getter
+@AllArgsConstructor
+public enum CsFlag {
+	CHECK("checked","已经处理"),
+	UN_CHECK("uncheck","未处理"),
+	;
+	@JsonValue
+	@EnumValue
+	String code;
+	String msg;
+
+
+	public boolean isCheck(){
+		return Objects.equals(this,CHECK);
+	}
+}

ldt-core/src/main/java/org/springblade/gateway/common_gateway/controller/AppBillsController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springblade.common.enums.AppConstant;
+import org.springblade.common.enums.CsFlag;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.TenantIgnore;
@@ -66,7 +67,7 @@ public class AppBillsController {
 			.gt("balanceNum".equals(billType),Bills::getBalanceNum, BigDecimal.ZERO)
 			.gt("pointNum".equals(billType),Bills::getPointNum, BigDecimal.ZERO)
 			.likeRight(format!=null,Bills::getCreateTime,format)
-			.and(wrapper ->wrapper.eq(Bills::getPayStatus,AppConstant.BillPayStatus.付款成功.name()).or().eq(Bills::getPayStatus,AppConstant.BillPayStatus.已完结.name()))
+			.and(wrapper ->wrapper.eq(Bills::getPayStatus,AppConstant.BillPayStatus.付款成功.name()).or().eq(Bills::getCsFlag, CsFlag.CHECK))
 			.orderByDesc(Bills::getCreateTime);
 		IPage<Bills> pages = billsService.page(Condition.getPage(query), queryWrapper);
 		return R.data(AppBillsWrapper.build(loginUserService).pageVO(pages));
@@ -106,7 +107,7 @@ public class AppBillsController {
 		queryWrapper.lambda()
 			.eq(Bills::getPayId,bills.getPayId())
 			.like(format!=null,Bills::getCreateTime,format)
-			.and(wrapper ->wrapper.eq(Bills::getPayStatus,AppConstant.BillPayStatus.付款成功.name()).or().eq(Bills::getPayStatus,AppConstant.BillPayStatus.已完结.name()))
+			.and(wrapper ->wrapper.eq(Bills::getPayStatus,AppConstant.BillPayStatus.付款成功.name()).or().eq(Bills::getCsFlag,CsFlag.CHECK))
 			.orderByDesc(Bills::getCreateTime);
 		IPage<Bills> pages = billsService.page(Condition.getPage(query), queryWrapper);
 		return R.data(AppBillsWrapper.build(shopService).pageVO(pages));
@@ -127,14 +128,14 @@ public class AppBillsController {
 			.eq(billStatisticsDTO.getPayId() != null, Bills::getPayId, billStatisticsDTO.getPayId())
 			.eq(billStatisticsDTO.getReceiveId() != null, Bills::getReceiveId, billStatisticsDTO.getReceiveId())
 			.between(Bills::getCreateTime, DateUtil.beginOfYear(billStatisticsDTO.getQueryDate()), DateUtil.endOfYear(billStatisticsDTO.getQueryDate()))
-			.and(wrapper -> wrapper.eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name()).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name())));
+			.and(wrapper -> wrapper.eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name()).or().eq(Bills::getCsFlag,CsFlag.CHECK)));
 
 		//获取合计多少元
 		QueryWrapper<Bills> billsQueryWrapper = Condition.getQueryWrapper(new Bills());
 		billsQueryWrapper.select("SUM(" + billStatisticsDTO.getQueryColumn() + ") as totalMoney")
 			.eq(billStatisticsDTO.getPayId() != null, "pay_id", billStatisticsDTO.getPayId())
 			.eq(billStatisticsDTO.getReceiveId() != null, "receive_id", billStatisticsDTO.getReceiveId())
-			.and(wrapper -> wrapper.eq("pay_status", AppConstant.BillPayStatus.付款成功.name()).or().eq("pay_status", AppConstant.BillPayStatus.已完结.name()))
+			.and(wrapper -> wrapper.eq("pay_status", AppConstant.BillPayStatus.付款成功.name()).or().eq("cs_flag",CsFlag.CHECK))
 			.between("create_time", DateUtil.beginOfYear(billStatisticsDTO.getQueryDate()), DateUtil.endOfYear(billStatisticsDTO.getQueryDate()));
 		Map<String, Object> map = billsService.getMap(billsQueryWrapper);
 		BigDecimal totalMoney = BigDecimal.ZERO;
@@ -147,7 +148,7 @@ public class AppBillsController {
 			.eq("DATE_FORMAT(create_time, '%Y')", year)
 			.eq(billStatisticsDTO.getPayId() != null, "pay_id", billStatisticsDTO.getPayId())
 			.eq(billStatisticsDTO.getReceiveId() != null, "receive_id", billStatisticsDTO.getReceiveId())
-			.and(wrapper -> wrapper.eq("pay_status", AppConstant.BillPayStatus.付款成功.name()).or().eq("pay_status", AppConstant.BillPayStatus.已完结.name()))
+			.and(wrapper -> wrapper.eq("pay_status", AppConstant.BillPayStatus.付款成功.name()).or().eq("cs_flag",CsFlag.CHECK))
 			.groupBy("month");
 
 		List<Map<String, Object>> listMaps = billsService.listMaps(queryWrapper);

ldt-core/src/main/java/org/springblade/gateway/goods_gatway/service/impl/AppGoodsBillsServiceImpl.java

@@ -100,7 +100,7 @@ public class AppGoodsBillsServiceImpl extends BaseServiceImpl<GoodsBillsMapper,
 		appGoodsBillsDTO.setVerifyNum(Integer.valueOf(verifyNum));
 		appGoodsBillsDTO.setPayStatus(successParams.getStatus());
 		appGoodsBillsDTO.setTenantId(successParams.getTenantId());
-		if (appGoodsBillsDTO.getPayStatus().equals(AppConstant.BillPayStatus.付款成功.name())||appGoodsBillsDTO.getPayStatus().equals(AppConstant.BillPayStatus.已完结.name())) {
+		if (appGoodsBillsDTO.getPayStatus().equals(AppConstant.BillPayStatus.付款成功) ){
 			appGoodsBillsDTO.setOrderStatus(GoodsConstant.GOODS_STATUS.制作中.name());
 		}
 		this.save(appGoodsBillsDTO);

ldt-core/src/main/java/org/springblade/gateway/shop_gateway/controller/AppShopController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.enums.AppConstant;
+import org.springblade.common.enums.CsFlag;
 import org.springblade.common.enums.WithdrawType;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -169,7 +170,7 @@ public class AppShopController {
 			.and(wrapper -> wrapper
 				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name())
 				.or()
-				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name())));
+				.eq(Bills::getCsFlag, CsFlag.CHECK)));
 
 
 		//今日现金收益
@@ -279,7 +280,7 @@ public class AppShopController {
 			.and(wrapper -> wrapper
 				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name())
 				.or()
-				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()));
+				.eq(Bills::getCsFlag, CsFlag.CHECK));
 		Map<String, Object> map = billsService.getMap(queryWrapper);
 		BigDecimal todayRevenue = (BigDecimal) map.get("todayRevenue");
 		return todayRevenue;
@@ -300,7 +301,7 @@ public class AppShopController {
 			.and(wrapper -> wrapper
 				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name())
 				.or()
-				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()));
+				.eq(Bills::getCsFlag, CsFlag.CHECK));
 		Map<String, Object> map = billsService.getMap(queryWrapper);
 		BigDecimal todayBalance = (BigDecimal) map.get("todayBalance");
 		return todayBalance;
@@ -321,7 +322,7 @@ public class AppShopController {
 			.and(wrapper -> wrapper
 				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name())
 				.or()
-				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()));
+				.eq(Bills::getCsFlag, CsFlag.CHECK));
 		Map<String, Object> map2 = billsService.getMap(queryWrapper2);
 		BigDecimal todayPoint = map2 == null ? BigDecimal.ZERO : (BigDecimal) map2.get("todayPoint");
 		return todayPoint;
@@ -342,7 +343,7 @@ public class AppShopController {
 			.and(wrapper -> wrapper
 				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name())
 				.or()
-				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()));
+				.eq(Bills::getCsFlag, CsFlag.CHECK));
 		Map<String, Object> map3 = billsService.getMap(queryWrapper3);
 		BigDecimal todayCharge = map3 == null ? BigDecimal.ZERO : (BigDecimal) map3.get("todayCharge");
 		return todayCharge;

ldt-core/src/main/java/org/springblade/gateway/web_gateway/controller/CensusController.java

@@ -13,6 +13,7 @@ import lombok.SneakyThrows;
 import org.springblade.common.aop.core.TenantAop;
 import org.springblade.common.constant.Agent;
 import org.springblade.common.enums.AppConstant;
+import org.springblade.common.enums.CsFlag;
 import org.springblade.common.enums.OrderType;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
@@ -82,7 +83,7 @@ public class CensusController {
 				wq.eq(Bills::getType, OrderType.MALL_RECHARGE).or().eq(Bills::getType,OrderType.AGENT_CHARGE);
 			})
 			.and(wq -> {
-				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
+				wq.eq(Bills::getCsFlag, CsFlag.CHECK).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			}));
 		return R.data(new TenantCensusVo()
 			.setUserCount(loginUserService.count())
@@ -106,7 +107,7 @@ public class CensusController {
 				wq.eq(Bills::getType, OrderType.MALL_RECHARGE).or().eq(Bills::getType,OrderType.AGENT_CHARGE);
 			})
 			.and(wq -> {
-				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
+				wq.eq(Bills::getCsFlag, CsFlag.CHECK).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			}));
 		return R.data(new TenantCensusVo()
 			.setUserCount(loginUserService.count(new QueryWrapper<LoginUser>().eq("date_format(create_time,'%Y-%m-%d')", date)))

ldt-core/src/main/java/org/springblade/gateway/web_gateway/controller/PressureTestController.java

@@ -203,7 +203,7 @@ public class PressureTestController {
 	@ApiModelProperty("测试发送微信收款信息")
 	public void sendWXMessage() {
 		String openId = "ofVsB40EmE24bQP-ZhUV5I5hBB0M";
-		String contentStr = String.format(MessageTemplate.PAYMENT_NOTICE.getContentString(), BigDecimal.valueOf(0.01), "已完结", "1457649143315988481", DateUtil.format(LocalDateTime.now(), "yyyy年MM月dd日 HH:mm:ss"));
+		String contentStr = String.format(MessageTemplate.PAYMENT_NOTICE.getContentString(), BigDecimal.valueOf(0.01), "付款成功", "1457649143315988481", DateUtil.format(LocalDateTime.now(), "yyyy年MM月dd日 HH:mm:ss"));
 		JSONObject content = JSON.parseObject(contentStr);
 		weChatService.sendTemplateMessage(openId, MessageTemplate.PAYMENT_NOTICE, content, configForShop.getPaymentPage(), MiniProgramType.SHOP);
 	}

ldt-core/src/main/java/org/springblade/ldt/bills/controller/BalanceBillsController.java

@@ -146,7 +146,7 @@ public class BalanceBillsController extends BladeController {
 			.select("sum(total_price) as price,type as type")
 			.lambda()
 			.and(wq -> {
-				wq.eq(BalanceBills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(BalanceBills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
+				wq.eq(BalanceBills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			})
 			.groupBy(BalanceBills::getType)));
 	}

ldt-core/src/main/java/org/springblade/ldt/bills/controller/BillsController.java

@@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.aop.core.TenantAop;
 import org.springblade.common.constant.Salesman;
 import org.springblade.common.enums.AppConstant;
+import org.springblade.common.enums.CsFlag;
 import org.springblade.common.utils.ExcelWriteUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -145,7 +146,7 @@ public class BillsController extends BladeController {
 			.select("sum(total_price) as price,type as type")
 			.lambda()
 			.and(wq -> {
-				wq.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name()).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
+				wq.eq(Bills::getCsFlag, CsFlag.CHECK).or().eq(Bills::getPayStatus, AppConstant.BillPayStatus.付款成功.name());
 			})
 			.groupBy(Bills::getType)));
 	}

ldt-core/src/main/java/org/springblade/ldt/bills/entity/Bills.java

@@ -18,6 +18,7 @@ package org.springblade.ldt.bills.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.common.enums.CsFlag;
 import org.springblade.core.mp.base.BaseEntity;
 import java.time.LocalDateTime;
 import lombok.Data;
@@ -183,5 +184,5 @@ public class Bills extends TenantEntity {
 	private BigDecimal actualIncome;
 
 
-	private boolean csFlag;
+	private CsFlag csFlag;
 }

ldt-core/src/main/java/org/springblade/ldt/bills/mapper/BillsMapper.xml

@@ -19,7 +19,7 @@
         <result column="discount" property="discount"/>
         <result column="price" property="price"/>
         <result column="type" property="type"/>
-        <result column="payway" property="payway"/>
+        <result column="payway" property="payWay"/>
         <result column="pay_plugin" property="payPlugin"/>
         <result column="channel_id" property="channelId"/>
         <result column="pay_status" property="payStatus"/>
@@ -35,6 +35,7 @@
         <result column="point_fee" property="pointFee"/>
         <result column="total_price" property="totalPrice"/>
         <result column="actual_income" property="actualIncome"/>
+        <result column="cs_flag" property="csFlag"/>
     </resultMap>
 
 

ldt-core/src/main/java/org/springblade/payment/callback/trade/UserPayCS.java

@@ -9,10 +9,12 @@ import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.enums.AppConstant;
+import org.springblade.common.enums.CsFlag;
 import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.tool.utils.AesUtil;
 import org.springblade.gateway.common_gateway.entity.vo.BillSuccessEvent;
 import org.springblade.ldt.bills.entity.BalanceBills;
 import org.springblade.ldt.bills.entity.Bills;
@@ -93,7 +95,7 @@ public class UserPayCS {
 				LoginUser user = loginUserService.getById(successParams.getBills().getPayId());
 				Bills bills = billsService.getById(successParams.getBills().getId());
 				//回调已处理，忽略后续回调
-				if (!bills.isCsFlag()) {
+				if (bills.getCsFlag().isCheck()) {
 					return;
 				}
 
@@ -142,7 +144,7 @@ public class UserPayCS {
 				pointBills = (PointBills) tenantEntities.get(0);
 				balanceBills = handleBalanceBills(balanceBills, user);
 //				bills.setPayStatus(AppConstant.BillPayStatus.已完结.name());
-				bills.setCsFlag(true);
+				bills.setCsFlag(CsFlag.CHECK);
 				Shop shop = updateShopBalance(bills, ypSettleAmount);
 
 				List<TenantEntity> handleSendPointBills = handleSendPointBills(channelPoint, bills, user);
@@ -379,6 +381,7 @@ public class UserPayCS {
 		member.setTenantId(bills.getTenantId());
 		return member;
 	}
+
 }
 
 

ldt-core/src/main/java/org/springblade/payment/handle/Trade.java

@@ -5,10 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.cache.PaymentCache;
-import org.springblade.common.enums.AppConstant;
-import org.springblade.common.enums.OrderType;
-import org.springblade.common.enums.PaymentScene;
-import org.springblade.common.enums.ResCode;
+import org.springblade.common.enums.*;
 import org.springblade.common.utils.TradeException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.gateway.shop_gateway.service.IAppShopService;
@@ -200,7 +197,7 @@ public class Trade {
 		bills.setPayScene(PaymentScene.MINI_PROGRAM.name());
 		bills.setMallId(order.getMallId());
 		bills.setTenantId(tenantId);
-		bills.setCsFlag(false);
+		bills.setCsFlag(CsFlag.UN_CHECK);
 		bills.setTotalPrice(order.getMoney());
 		Assert.isTrue(dataHandle.saveOrUpdateEntity(billsService, bills), () -> {
 			throw new ServiceException(ResCode.TRADE_ERROR);