update:微信支付。

fengliang
1 parent 5cde1c03
Showing 12 changed files with 173 additions and 52 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/dao/OrderMapper.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderWeChatPayBatch.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/Order.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderGoodsServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/type/OrderDeductionState.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderMapper.xml
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/PayRpc.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/WeChatPayTradeBackDto.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/WeChatPayTradeDto.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/resolver/WeChatPayRpcResolver.java
@@ -372,22 +372,6 @@ public class OrderController {
             return ParameterDetection.detection(result);
         }
         Message message = orderService.orderWeChatPayBatch(orderWeChatPayBatch, OrderOrderType.BUYER_ORDER.getCodeInteger(),OrderOrderState.BUYER_WECHAT_PAY);
-
-        //临时代码
-        WeChatPayTradeBackDto weChatPayTradeBackDto = (WeChatPayTradeBackDto) message.getData();
-        WeChatPayTradeCallBackDto weChatPayTradeCallBackDto = new WeChatPayTradeCallBackDto();
-        weChatPayTradeCallBackDto.setPaymentId(weChatPayTradeBackDto.getPaymentId());
-        weChatPayTradeCallBackDto.setState(WeChatPayState.SUCCESS.getCode());
-        weChatPayTradeCallBackDto.setWhen(LocalDateTime.now());
-        List<Order> orderList = orderService.wxChatPayCallBack(weChatPayTradeCallBackDto);
-        if(CollectionUtils.isEmpty(orderList)){
-            return Message.success("没有订单发生变更");
-        }else{
-            for (Order order : orderList){
-                orderService.finishOrder(order);
-            }
-        }
-        //临时代码结束
         return message;
     }
@@ -125,4 +125,10 @@ public interface OrderMapper extends MybatisMapperSupport {
      * @return
      */
     OrderDto selectOrderState(String code);
+
+    /**
+     * 更新订单库存为已扣减
+     * @param ids
+     */
+    void updateDeductState(@Param("ids")List<Long> ids);
 }
@@ -54,7 +54,6 @@ public class OrderWeChatPayBatch {
     @Valid
     private OrderDeliveryDto delivery;
-    @NotBlank(message = "登陆编码不能为空")
     private String code;
     public String getPayType() {
@@ -281,6 +281,8 @@ public class Order {
     /** 运费 */
     private Long transportFee;
+    /** 运费 */
+    private Integer stockDeductionState;
     public Integer getAchieveType() {
         return achieveType;
@@ -745,4 +747,12 @@ public class Order {
     public void setTransportFee(Long transportFee) {
         this.transportFee = transportFee;
     }
+
+    public Integer getStockDeductionState() {
+        return stockDeductionState;
+    }
+
+    public void setStockDeductionState(Integer stockDeductionState) {
+        this.stockDeductionState = stockDeductionState;
+    }
 }
 \ No newline at end of file
@@ -265,6 +265,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Transactional
     @Override
     public void deduct(Order order,Long operateId,String operateName) {
+        //检测是否扣减过，已扣减则不再继续扣减
+        if(order.getStockDeductionState()!=null&&order.getStockDeductionState().equals(OrderDeductionState.DEDUCT_FINISH.getCodeInteger())){
+            return ;
+        }
         List<ProductDto> realgoods = getProductDtoByOrderId(order.getId(),order.getMarketId(),OrderGoodState.NORMAL.getCodeInteger());
         Map<Long,ProductDto> deductGoods = new HashMap<>();
         for(ProductDto productDto :realgoods){
@@ -286,6 +290,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             goods.add(stock);
             try{
                 stockService.deduct(goods);
+                order.setStockDeductionState(OrderDeductionState.DEDUCT_FINISH.getCodeInteger());
             }catch (StockNotFoundException | InsufficientStockException e){
                 throw new InsufficientStockException(e.getCode(),"支付失败，"+productDto.getProductName()+"库存不足。");
             }
@@ -296,7 +301,16 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     public void deductBatch(List<Order> orders, Long operateId, String operateName) {
         List<ProductExtDto> realgoods = new ArrayList<>();
         for(Order order : orders){
+            //判断订单是否已经扣减过库存
+            if(order.getStockDeductionState()!=null&&OrderDeductionState.DEDUCT_FINISH.getCodeInteger().equals(order.getStockDeductionState())){
+                continue;
+            }
             realgoods.addAll(orderGoodsMapper.getProductDtoWithOrder(order.getId(),order.getShopId(),order.getMarketId(),order.getShopCustomerId(),OrderGoodState.NORMAL.getCodeInteger()));
+            //变更订单库存扣减状态
+            order.setStockDeductionState(OrderDeductionState.DEDUCT_FINISH.getCodeInteger());
+        }
+        if(realgoods.size()<1){
+            return ;
         }
         Map<Long,ProductExtDto> deductGoods = new HashMap<>();
         for(ProductExtDto productExtDto :realgoods){
@@ -318,6 +332,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             goods.add(stock);
             try{
                 stockService.deduct(goods);
+
             }catch (StockNotFoundException | InsufficientStockException e){
                 throw new InsufficientStockException(e.getCode(),"支付失败，"+productExtDto.getProductName()+"库存不足。");
             }
@@ -647,6 +647,7 @@ public class OrderServiceImpl implements OrderService {
         try{
             //扣减库存T
             orderGoodsService.deductBatch(orderMap,orderPayBatch.getPayerCustomerId(),orderPayBatch.getPayerCustomerName());
+            orderMapper.updateDeductState(orderMap.stream().map(Order::getId).collect(Collectors.toList()));
             LOGGER.info("支付完成写入流水");
             orderPaymentService.sendSerialRecord(serialRecordDtos);
         }catch (OrderException oe){
@@ -791,7 +792,7 @@ public class OrderServiceImpl implements OrderService {
         weChatPayTradeDto.setAmount(orderWeChatPayBatch.getTotlePayAmount().multiply(NumberTransform.ONE_HUNDERD).longValue());
         weChatPayTradeDto.setMarketId(orderWeChatPayBatch.getMarketId());
         weChatPayTradeDto.setType(orderWeChatPayBatch.getPayType());
-        weChatPayTradeDto.setCode(orderWeChatPayBatch.getCode());
+        //weChatPayTradeDto.setCode(orderWeChatPayBatch.getCode());
         weChatPayTradeDto.setOutTradeNo(orderWeChatPayBatch.getCodes().get(0));
         weChatPayTradeDto.setGoodsDesc(shop.getName());
         weChatPayTradeDto.setNotifyUrl(OrderConstant.WECHATPAY_BACK_API);
@@ -832,7 +833,8 @@ public class OrderServiceImpl implements OrderService {
         }
         //扣减库存T
         orderGoodsService.deductBatch(orderList,orderWeChatPayBatch.getPayerCustomerId(),orderWeChatPayBatch.getPayerCustomerName());
-
+        //更新扣减库存状态
+        orderMapper.updateDeductState(orderList.stream().map(Order::getId).collect(Collectors.toList()));
         //返回数据，由小程序发起微信支付。
         return Message.success(weChatPayTradeBackDto);
     }
+package com.diligrp.etrade.order.type;
+
+import com.diligrp.etrade.core.type.IEnumType;
+
+/**
+ * 操作类型
+ */
+public enum OrderDeductionState implements IEnumType {
+    UN_DEDUCT("未扣减", 1),
+    DEDUCT_FINISH("已扣减", 2)
+    ;
+
+    private String name;
+    private Integer code;
+
+    private OrderDeductionState(String name, Integer code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static OrderDeductionState getByCode(Integer code) {
+        for (OrderDeductionState temp : OrderDeductionState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp;
+            }
+        }
+        return null;
+    }
+
+    public static String getNameByCode(Integer code) {
+        for (OrderDeductionState temp : OrderDeductionState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp.getName();
+            }
+        }
+        return null;
+    }
+
+    public Integer getCodeInteger() {
+        return this.code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+}
 \ No newline at end of file
@@ -59,6 +59,7 @@
       <result column="achieve_address" jdbcType="VARCHAR" property="achieveAddress" />
       <result column="achieve_state" jdbcType="INTEGER" property="achieveState" />
       <result column="transport_fee" jdbcType="BIGINT" property="transportFee" />
+      <result column="stock_deduction_state" jdbcType="BIGINT" property="stockDeductionState" />
   </resultMap>
   <sql id="Base_Column_List">
     id, code, mapping_code, market_id, buyer_code, buyer_id,buyer_store_customer_id, buyer_name, buyer_account_id,
@@ -68,7 +69,7 @@
     pay_time, order_state, `state`, version, creater_id, creater, created_time, modifier_id,
     modifier, modified_time, verify_ids, verifier,verify_state, verifier_time, cancel_id, cancel_name,
     cancel_time, out_time,`source`,totle_seller_fee,district_id,district_name,sub_district_id,sub_district_name,location
-        ,order_status,relation_id,achieve_type,achieve_address,achieve_state,transport_fee
+        ,order_status,relation_id,achieve_type,achieve_address,achieve_state,transport_fee,stock_deduction_state
   </sql>
     <sql id="Dto_Column_List">
             id,
@@ -383,6 +384,15 @@
         set order.totle_seller_fee = #{totleSellerFee}
         where id = #{id,jdbcType=BIGINT}
     </update>
+    <update id="updateDeductState" parameterType="java.util.List">
+        update `order`
+        set order.stock_deduction_state = 2
+        where id in (
+        <foreach collection="ids" item="id" separator=",">
+            #{id}
+        </foreach>
+        )
+    </update>
     <select id="getOrderByCode" resultMap="BaseResultMap">
       SELECT
@@ -112,4 +112,31 @@ public interface PayRpc {
      */
     @RequestMapping(value = "/wechat/api/gateway.do?service=wechat.payment.service:exists", method = RequestMethod.POST)
     Message<WeChatPayFunctionBackDto> checkWeChatPayChannel(@RequestBody WeChatPayFunctionDto requestDto, @RequestHeader HttpHeaders headers);
+
+    /**
+     * 微信杭州银行支付
+     * @param requestDto
+     * @param headers
+     * @return
+     */
+    @RequestMapping(value = "/wechat/api/gateway.do?service=hzbank.payment.service:prepay", method = RequestMethod.POST)
+    Message<WeChatPayTradeBackDto> wechatHgPay(@RequestBody WeChatPayTradeDto requestDto, @RequestHeader HttpHeaders headers);
+
+    /**
+     * 微信杭州银行预支付关闭
+     * @param requestDto
+     * @param headers
+     * @return
+     */
+    @RequestMapping(value = "/wechat/api/gateway.do?service=hzbank.payment.service:close", method = RequestMethod.POST)
+    Message<WeChatPayFunctionBackDto> wechatHgPayClose(@RequestBody WeChatPayFunctionDto requestDto, @RequestHeader HttpHeaders headers);
+
+    /**
+     * 微信杭州银行预支付状态查询
+     * @param requestDto
+     * @param headers
+     * @return
+     */
+    @RequestMapping(value = "/wechat/api/gateway.do?service=hzbank.payment.service:state", method = RequestMethod.POST)
+    Message<WeChatPayFunctionBackDto> wechatHgPayCheckState(@RequestBody WeChatPayFunctionDto requestDto, @RequestHeader HttpHeaders headers);
 }
@@ -40,6 +40,13 @@ public class WeChatPayTradeBackDto {
      */
     private String paySign;
+    // token
+    private String tokenCode;
+    // 小程序跳转地址
+    private String tokenCodeUrl;
+    // token过期时间
+    private String tokenEnd;
+
     public String getPaymentId() {
         return paymentId;
@@ -96,4 +103,28 @@ public class WeChatPayTradeBackDto {
     public void setPaySign(String paySign) {
         this.paySign = paySign;
     }
+
+    public String getTokenCode() {
+        return tokenCode;
+    }
+
+    public void setTokenCode(String tokenCode) {
+        this.tokenCode = tokenCode;
+    }
+
+    public String getTokenCodeUrl() {
+        return tokenCodeUrl;
+    }
+
+    public void setTokenCodeUrl(String tokenCodeUrl) {
+        this.tokenCodeUrl = tokenCodeUrl;
+    }
+
+    public String getTokenEnd() {
+        return tokenEnd;
+    }
+
+    public void setTokenEnd(String tokenEnd) {
+        this.tokenEnd = tokenEnd;
+    }
 }
@@ -13,10 +13,10 @@ import java.util.List;
 public class WeChatPayTradeDto {
     /**
-     * 支付方式-JSAPI, NATIVE等
+     * 支付方式-Cashier
      */
-    @NotNull(message = "payType should not be null")
-    private String type;
+
+    private String type = "Cashier";
     /**
      * 微信商品描述-微信扫码支付时显示-不超过128个字符
      */
@@ -58,21 +58,13 @@ public class WeChatPayRpcResolver {
     public Message<WeChatPayTradeBackDto>  createWeChatPayTrade(WeChatPayTradeDto weChatPayTradeDto){
         //创建提交单
         weChatPayTradeDto.setNotifyUrl(backBaseUrl+weChatPayTradeDto.getNotifyUrl());
+        weChatPayTradeDto.setType("Cashier");
         weChatPayTradeDto.setDescription(weChatPayTradeDto.getDescription()==null?"电子交易结算":weChatPayTradeDto.getDescription());
         //组装headers
         HttpHeaders prepareHeaders = creatHeader(weChatPayTradeDto.getMarketId().toString(),PAY_STATE_PREPARE);
-        //临时代码 TODO
-        WeChatPayTradeBackDto backDto = new WeChatPayTradeBackDto();
-        backDto.setPaymentId(new Snowflake().nextIdStr());
-        backDto.setPaySign("PaySign");
-        backDto.setCodeUrl("codeUrl");
-        backDto.setSignType("SignType");
-        backDto.setPacket("packet");
-        backDto.setNonceStr("NonceStr");
-        Message<WeChatPayTradeBackDto> prepareJsonObject = Message.success(backDto);
-        //Message<WeChatPayTradeBackDto> prepareJsonObject = payRpc.wechatPay(weChatPayTradeDto, prepareHeaders);
+        Message<WeChatPayTradeBackDto> prepareJsonObject = payRpc.wechatHgPay(weChatPayTradeDto, prepareHeaders);
         if(!prepareJsonObject.getCode().equals(200)){
-            log.info("创建交易入参{},请求体头部为{},请求结果为{}",prepareHeaders,prepareHeaders,prepareJsonObject);
+            log.info("创建交易入参{},请求体头部为{},请求结果为{}",weChatPayTradeDto,prepareHeaders,prepareJsonObject);
             throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "创建交易信息失败：" + prepareJsonObject.getMessage());
         }else {
             return prepareJsonObject;
@@ -87,14 +79,7 @@ public class WeChatPayRpcResolver {
     public Message<WeChatPayFunctionBackDto>  checkWeChatPayState(WeChatPayFunctionDto weChatPayFunctionDto){
         //组装headers
         HttpHeaders prepareHeaders = creatHeader(weChatPayFunctionDto.getMarketId().toString(), PAY_STATE_CHECK);
-        //临时代码 TODO
-        WeChatPayFunctionBackDto weChatPayFunctionBackDto = new WeChatPayFunctionBackDto();
-        weChatPayFunctionBackDto.setState(WeChatPayState.SUCCESS.getCode());
-        weChatPayFunctionBackDto.setPaymentId(weChatPayFunctionBackDto.getPaymentId());
-        weChatPayFunctionBackDto.setWhen(LocalDateTime.now());
-        weChatPayFunctionBackDto.setStateCode("101");
-        Message<WeChatPayFunctionBackDto> cancelJsonObject = Message.success(weChatPayFunctionBackDto);
-        //Message<WeChatPayFunctionBackDto> cancelJsonObject = payRpc.wechatPayCheckState(weChatPayFunctionDto, prepareHeaders);
+        Message<WeChatPayFunctionBackDto> cancelJsonObject = payRpc.wechatHgPayCheckState(weChatPayFunctionDto, prepareHeaders);
         if(!cancelJsonObject.getCode().equals(200)){
             log.info("撤销交易入参{},请求体头部为{},请求结果为{}",weChatPayFunctionDto,prepareHeaders,cancelJsonObject);
@@ -110,17 +95,15 @@ public class WeChatPayRpcResolver {
      * @return true 关闭成功
      */
     public Boolean  closeWeChatPay(WeChatPayFunctionDto weChatPayFunctionDto){
-        //临时代码 TODO
-        return true;
         //组装headers
-//        HttpHeaders prepareHeaders = creatHeader(weChatPayFunctionDto.getMarketId().toString(), PAY_STATE_CLOSE);
-//        Message<WeChatPayFunctionBackDto> cancelJsonObject = payRpc.wechatPayClose(weChatPayFunctionDto, prepareHeaders);
-//        if(!cancelJsonObject.getCode().equals(200)){
-//            log.info("关闭微信支付订单入参{},请求体头部为{},请求结果为{}",weChatPayFunctionDto,prepareHeaders,cancelJsonObject);
-//            throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "关闭微信支付订单失败：" + cancelJsonObject.getMessage());
-//        }else {
-//            return true;
-//        }
+        HttpHeaders prepareHeaders = creatHeader(weChatPayFunctionDto.getMarketId().toString(), PAY_STATE_CLOSE);
+        Message<WeChatPayFunctionBackDto> cancelJsonObject = payRpc.wechatHgPayClose(weChatPayFunctionDto, prepareHeaders);
+        if(!cancelJsonObject.getCode().equals(200)){
+            log.info("关闭微信支付订单入参{},请求体头部为{},请求结果为{}",weChatPayFunctionDto,prepareHeaders,cancelJsonObject);
+            throw new PlatformServiceException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "关闭微信支付订单失败：" + cancelJsonObject.getMessage());
+        }else {
+            return true;
+        }
     }
 //    /**