Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/service/IDragonOrdersService.java

@@ -13,4 +13,6 @@ public interface IDragonOrdersService {
     String dragonNotify(HttpServletRequest request,String payType,String deviceFrom);
 
     DragonPayOrderQueryRespDto checkOrderStatusByCode(String code);
+
+    boolean manulNotify(String code);
 }

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -40,22 +40,22 @@ liquidnet:
   service:
     adam:
       url-pay:
-        pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
+        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
         callback: http://testadam.zhengzai.tv/adam/member/order/callback
       url-service:
         url: http://testservice.zhengzai.tv
     kylin:
       url-pay:
-        pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
-        check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
+        pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
+        check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
       url-service:
         url: http://testservice.zhengzai.tv/
     order:
       url-pay:
-        pay: http://testpay.zhengzai.tv/
-        check: http://testpay.zhengzai.tv/order/verify
+        pay: http://testdragon.zhengzai.tv/
+        check: http://testdragon.zhengzai.tv/order/verify
         localUrl: http://testorder.zhengzai.tv/order/order/syncOrder
       url-service:
         url: http://testservice.zhengzai.tv/
@@ -104,4 +104,4 @@ liquidnet:
       appMasterSecret: dmsho74wlpd1hp7vrwp9bjehzwo29pza
 
 
-#application-test-end
+#application-test-end
\ No newline at end of file

liquidnet-bus-do/liquidnet-service-dragon-do/src/main/java/com/liquidnet/service/dragon/entity/DragonOrders.java

@@ -66,6 +66,11 @@ public class DragonOrders implements Serializable {
      */
     private String notifyUrl;
 
+    /**
+     * notify_status
+     */
+    private String notifyStatus;
+
     /**
      * payment_type
      */

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/biz/DragonPayBiz.java

@@ -64,6 +64,7 @@ public class DragonPayBiz {
         orders.setOrderCode(dragonPayBaseReqDto.getOrderCode());
         orders.setClientIp(dragonPayBaseReqDto.getClientIp());
         orders.setNotifyUrl(dragonPayBaseReqDto.getNotifyUrl());
+        orders.setNotifyStatus(DragonConstant.PayNotifyStatusEnum.NOTIFY_INIT.getCode());
         orders.setPaymentType((dragonPayBaseReqDto.getDeviceFrom()+dragonPayBaseReqDto.getPayType()).toUpperCase());
 //        orders.setPaymentId();
         orders.setPaymentAt(LocalDateTime.now());
@@ -81,7 +82,7 @@ public class DragonPayBiz {
                 new Object[]{orders.getOrderId(),orders.getStatus(), orders.getCode(), orders.getType()
                         , orders.getPrice(), orders.getName(), orders.getDetail()
                         , orders.getOrderCode(), orders.getClientIp()
-                        , orders.getNotifyUrl(), orders.getPaymentType(),
+                        , orders.getNotifyUrl(), orders.getNotifyStatus(),orders.getPaymentType(),
                         orders.getPaymentId(), orders.getPaymentAt()
                         , orders.getFinishedAt(), orders.getCreatedAt()
                         , orders.getUpdatedAt(),orders.getDeletedAt()}

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/AbstractPayChannelStrategyImpl.java

@@ -75,7 +75,6 @@ public abstract class AbstractPayChannelStrategyImpl implements IPayChannelStrat
         //更新缓存
         dataUtils.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto);
         //修改订单状态
-        //修改订单状态
         dragonPayBiz.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto.getStatus(),null);
         //通知商户
         dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(dragonOrdersDto));

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -109,4 +111,19 @@ public class PayController {
         DragonPayOrderQueryRespDto respDto = dragonOrdersService.checkOrderStatusByCode(code);
         return ResponseDto.success(respDto);
     }
+
+    @GetMapping("/manulNotify")
+    @ApiOperation("手动通知商户")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "", example = "PAY202107131522368438531155")
+    })
+    @ResponseBody
+    public ResponseDto<Map<String,String>> manulNotify(@RequestParam(value = "code") @NotNull(message = "支付编号不能为空！") String code){
+        boolean respDto = dragonOrdersService.manulNotify(code);
+        Map<String,String> rs = new HashMap<>();
+        rs.put("code",code);
+        rs.put("result",""+respDto);
+        return ResponseDto.success(rs);
+    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrdersServiceImpl.java

@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.channel.strategy.PayChannelStrategyContext;
+import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
 import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.constant.DragonErrorCodeEnum;
 import com.liquidnet.service.dragon.dto.DragonOrdersDto;
@@ -32,6 +33,9 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
     @Autowired
     private DataUtils dataUtils;
 
+    @Autowired
+    private DragonPayBiz dragonPayBiz;
+
     @Override
     public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
         //设置支付编号
@@ -67,4 +71,12 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
         String payType = DragonConstant.PayTypeEnum.getEnumByCode(ordersDto.getPaymentType()).getPayType();
         return payChannelStrategyContext.getStrategy(payType).checkOrderStatus(code);
     }
+
+    @Override
+    public boolean manulNotify(String code) {
+        DragonOrdersDto ordersDto = dataUtils.getPayOrderByCode(code);
+        //通知商户
+        dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(ordersDto));
+        return false;
+    }
 }