商家端钱包

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/AssetClient.java

@@ -4,11 +4,10 @@ import com.chelvc.cloud.vehicle.client.dto.MerchantAssetDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient("vehicle")
 public interface AssetClient {
 
-    @GetMapping("/asset/merchant")
-    public MerchantAssetDTO getMerchantAsset(@RequestParam("merchantId") Long merchantId);
+    @GetMapping("/asset/merchant/{merchantId}")
+    MerchantAssetDTO getMerchantAsset(@PathVariable("merchantId") Long merchantId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/AssetController.java

@@ -5,7 +5,7 @@ import com.chelvc.cloud.vehicle.server.service.AssetService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -14,8 +14,8 @@ public class AssetController {
 
     private final AssetService assetService;
 
-    @GetMapping("/asset/merchant")
-    public MerchantAssetDTO getMerchantAsset(@RequestParam("merchantId") Long merchantId) {
+    @GetMapping("/asset/merchant/{merchantId}")
+    public MerchantAssetDTO getMerchantAsset(@PathVariable("merchantId") Long merchantId) {
         return this.assetService.getMerchantAsset(merchantId);
     }
 }

vehicle-server/src/main/resources/mapper/OmsOrderMapper.xml

@@ -955,7 +955,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             count(if(status = 4,true,null)) as verifyNum,
             SUM(CASE WHEN status = 4 THEN pay_amount ELSE 0 END) as verifyAmount,
-            count(if(status in (1,2,3),true,null)) as awaitNum,
+            count(CASE WHEN status in (1,2,3) THEN true ELSE null END) as awaitNum,
             SUM(CASE WHEN status in (1,2,3) THEN pay_amount ELSE 0 END) as awaitAmount
         FROM
             oms_order
@@ -965,9 +965,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryTeamOrder" resultType="com.chelvc.cloud.vehicle.client.dto.MerchantTeamDTO">
         SELECT
-            count(if(o.status = 4,true,null)) as verifyNum,
-            SUM(CASE WHEN o.status = 4 THEN o.pay_amount ELSE 0 END) as verifyAmount,
-            count(if(o.status in (1,2,3),true,null)) as awaitNum,
+            count(if(o.status = 4,true,null)) as popularizeNum,
+            SUM(CASE WHEN o.status = 4 THEN o.pay_amount ELSE 0 END) as popularizeAmount,
+            count(CASE WHEN o.status in (1,2,3) THEN true ELSE null END) as awaitNum,
             SUM(CASE WHEN o.status in (1,2,3) THEN o.pay_amount ELSE 0 END) as awaitAmount
         FROM
             oms_order o