支付逻辑

mall-service/src/main/java/com/txz/mall/controller/CombinationController.java

@@ -175,9 +175,9 @@ public class CombinationController {
     /**
      * 去开团
      */
-    @ApiOperation(value = "支付成功-去开团")
-    @PostMapping(value = "/open")
-    public Result goOpen(@RequestParam("orderId") Long orderId) {
+//    @ApiOperation(value = "支付成功-去开团")
+//    @PostMapping(value = "/open")
+    public Result goOpen(@RequestParam("orderId") String orderId) {
         storeOrderService.goOpen(orderId);
         return Result.success();
     }
@@ -185,8 +185,8 @@ public class CombinationController {
     /**
      * 去拼团
      */
-    @ApiOperation(value = "去拼团")
-    @PostMapping(value = "/pink")
+//    @ApiOperation(value = "去拼团")
+//    @PostMapping(value = "/pink")
     public Result goPink(@Validated @RequestBody GoPinkDTO dto) {
         if (dto.getPinkId() == null && dto.getCid() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);

mall-service/src/main/java/com/txz/mall/controller/OrderController.java

@@ -172,8 +172,8 @@ public class OrderController {
 
     @ApiOperation(value = "去支付")
     @PostMapping(value = "/goPay")
-    public Result getPayResult(@RequestParam Long orderId) {
-        Boolean result = storeOrderService.goPay(orderId);
+    public Result getPayResult(@RequestBody GoPinkDTO dto) {
+        Boolean result = storeOrderService.goPay(dto);
         return Result.success(result);
     }
 }

mall-service/src/main/java/com/txz/mall/service/StoreOrderService.java

@@ -27,7 +27,7 @@ public interface StoreOrderService extends Service<StoreOrder> {
     /**
      * 去开团
      */
-    void goOpen(Long orderId);
+    void goOpen(String orderId);
 
     /**
      * 去拼团
@@ -104,7 +104,6 @@ public interface StoreOrderService extends Service<StoreOrder> {
     /**
      * 获取支付结果
      *
-     * @param orderId 订单编号
      */
-    Boolean goPay(Long orderId);
+    Boolean goPay(GoPinkDTO dto);
 }

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -87,8 +87,11 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
 
 
     @Override
-    public void goOpen(Long orderId) {
-        StoreOrder storeOrder = findById(orderId);
+    public void goOpen(String orderId) {
+        StoreOrder storeOrder = findBy("orderId", orderId);
+        if (storeOrder == null) {
+            throw new ServiceException("订单不存在");
+        }
         StorePink storePink = new StorePink();
 //        storePink.setUid(user.getUid());
 //        storePink.setAvatar(user.getAvatar());
@@ -1145,7 +1148,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
     }
 
     @Override
-    public Boolean goPay(Long orderId) {
+    public Boolean goPay(GoPinkDTO dto) {
         // 扣取余额
 //        accountDubboServiceClient.recharge()
 //        Boolean b = accountDubboServiceClient.checkFee(user.getId(), storeOrder.getPayPrice());
@@ -1155,7 +1158,13 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
 //
 //        StoreOrder storeOrder = findById(orderId);
 //        if (storeOrder.getPaid() == 1) {
-        goOpen(orderId);
+
+        if ("open".equals(dto.getType())) {
+            goOpen(dto.getOrderId());
+        }
+        if ("join".equals(dto.getType())) {
+            goPink(dto);
+        }
         return true;
 //        } else {
 //            return false;

mall-service/src/main/java/dto/GoPinkDTO.java

@@ -27,4 +27,7 @@ public class GoPinkDTO implements Serializable {
 
     @ApiModelProperty(value = "拼团订单id")
     private String orderId;
+
+    @ApiModelProperty(value = "类型  open-开团  join-加团")
+    private String type;
 }