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

@@ -105,6 +105,7 @@ public class AppPointBillsController extends BladeController {
 		queryWrapper.lambda()
 			.eq(PointBills::getPayStatus,AppConstant.BillPayStatus.付款成功.name())
 			.like(format!=null,PointBills::getCreateTime,format)
+			.gt(PointBills::getPrice,BigDecimal.ZERO)
 			.and(wrapper ->wrapper.eq(PointBills::getReceiveId,userId)
 				.or().eq(PointBills::getPayId,userId))
 			.orderByDesc(PointBills::getCreateTime);

ldt-core/src/main/java/org/springblade/gateway/goods_gatway/controller/AppGoodsBillsController.java

@@ -44,7 +44,10 @@ import org.springblade.ldt.shop.service.IShopService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Date;
 import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
 
 /**
  * 订单 控制器

ldt-core/src/main/java/org/springblade/gateway/pointsChannel_gateway/controller/PointsChannelController.java

@@ -0,0 +1,43 @@
+package org.springblade.gateway.pointsChannel_gateway.controller;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import org.springblade.common.enums.AppConstant;
+import org.springblade.core.tool.api.R;
+import org.springblade.webSocket.WebSocketServer;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * @author cy-computer
+ */
+@RestController
+@RequestMapping("/pointsChannel")
+@AllArgsConstructor
+public class PointsChannelController {
+
+	private  WebSocketServer webSocketServer;
+
+	@RequestMapping("/callBack")
+	public R test(String response) {
+		JSONObject jsonObject = JSON.parseObject(response);
+		String requestId = (String) jsonObject.get("requestId");
+		Long userId = Convert.toLong(StrUtil.sub(requestId, 0, 19));
+		webSocketServer.sendInfo(
+			AppConstant.SOCKET_PRE.USER.getName() + userId,
+			JSON.toJSONString(jsonObject)
+		);
+		return R.data(true);
+	}
+
+}

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

@@ -34,6 +34,7 @@
         <result column="fee" property="fee"/>
         <result column="point_fee" property="pointFee"/>
         <result column="total_price" property="totalPrice"/>
+        <result column="actual_income" property="actualIncome"/>
     </resultMap>
 
 

ldt-core/src/main/java/org/springblade/ldt/bills/wrapper/GoodsBillsWrapper.java

@@ -58,7 +58,7 @@ public class GoodsBillsWrapper extends BaseEntityWrapper<GoodsBills, GoodsBillsV
 		if (shopService != null) {
 			Shop shop = shopService.getById(goodsBillsVO.getReceiveId());
 			String shopName= Optional.ofNullable(shop).map(Shop::getName).orElse("");
-			String shopPic= Optional.ofNullable(shop).map(Shop::getShopPic).orElse("");
+			String shopPic= Optional.ofNullable(shop).map(Shop::getCover).orElse("");
 			goodsBillsVO.setShopName(shopName);
 			goodsBillsVO.setShopPic(shopPic);
 		}

ldt-core/src/main/resources/application-dev.yml

@@ -38,11 +38,11 @@ spring:
     #  commandTimeout: 5000
   datasource:
     # MySql
-#    url: jdbc:mysql://192.168.1.168:3306/ldt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    url: jdbc:mysql://192.168.1.218:3306/gx-ldt-0823?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.1.168:3306/ldt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://192.168.1.218:3306/gx-ldt-0823?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: root@123456
-#    password: root
+#    password: root@123456
+    password: root
     # PostgreSQL
     #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
     #username: postgres