物流轨迹查询

ch-dao/src/main/java/com/wwdz/ch/db/dao/SwitchDao.java

@@ -4,4 +4,6 @@ import com.wwdz.ch.db.domain.Switch;
 
 public interface SwitchDao {
     Switch find();
+
+    int update(int state);
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/SwitchDaoImpl.java

@@ -18,4 +18,13 @@ public class SwitchDaoImpl implements SwitchDao {
         switchExample.orderBy("id asc");
         return switchMapper.selectOneByExample(switchExample);
     }
+
+
+    @Override
+    public int update(int state) {
+        Switch sswitch = new Switch();
+        sswitch.setId(1L);
+        sswitch.setState(state);
+        return switchMapper.updateByPrimaryKey(sswitch);
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -44,10 +44,14 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 						"/wx/consignSale/**",  "/wx/item/**",
 						"/wx/returnOrder/**", "/wx/distributionOrder/confirmSigned",  "/wx/distributionOrder/delivery", "/wx/distributionOrder/cancel",
 						"/wx/distributionOrder/refund",
-						"/wx/supplierItem/findItemsOfCurrentDistributor"
+						"/wx/supplierItem/findItemsOfCurrentDistributor", "/wx/selfPage/updateSwitch"
 						//下列路径上线注释
-						, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**",
+
+					/*	, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**",
 						"/wx/shareRecord/**","/wx/collectionBook/**", "/wx/collectedRecord/**", "/wx/collectionItemsRelation/**","/wx/collectionShareRecord/**"
+						,"/wx/logistics/**"
+						*/
+
 
 					/*	"/wx/officialAccount/**",
 						"/wx/item/**",

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/LogisticsServiceImpl.java

+package com.wwdz.ch.wx.impl.distribution;
+
+import com.wwdz.ch.core.entity.LogisticsRequestDto;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.domain.distribution.DistributionOrder;
+import com.wwdz.ch.wx.api.LogisticsApi;
+import com.wwdz.ch.wx.service.distribution.LogisticsService;
+import com.xxdxxs.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LogisticsServiceImpl implements LogisticsService {
+
+    private static final Logger logger = LoggerFactory.getLogger(LogisticsServiceImpl.class);
+
+    @Autowired
+    LogisticsApi logisticsApi;
+
+    @Autowired
+    DistributionOrderDao distributionOrderDao;
+
+    @Override
+    public Result findLogisticsInfo(String orderId) {
+        try {
+            DistributionOrder distributionOrder = distributionOrderDao.findById(orderId);
+            if (distributionOrder != null) {
+                if (StringUtils.hasLength(distributionOrder.getLogisticsCode()) && StringUtils.hasLength(distributionOrder.getWaybill())) {
+                    LogisticsRequestDto logisticsRequestDto = new LogisticsRequestDto();
+                    logisticsRequestDto.setLogisticsCode(distributionOrder.getLogisticsCode());
+                    logisticsRequestDto.setWaybill(distributionOrder.getWaybill());
+                    return logisticsApi.findTrails(logisticsRequestDto);
+                } else {
+                    return Result.failed("承运商信息为空");
+                }
+            }
+        } catch (Exception e) {
+            logger.error("修改开关状态 error : {}", e);
+        }
+        return Result.failed();
+    }
+
+
+
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SelfPageServiceImpl.java

@@ -7,6 +7,7 @@ import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.db.bean.DistributionOrderNum;
+import com.wwdz.ch.db.dao.SwitchDao;
 import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.AuctionConfig;
@@ -64,6 +65,9 @@ public class SelfPageServiceImpl implements SelfPageService {
     @Autowired
     SupplierItemDao supplierItemDao;
 
+    @Autowired
+    SwitchDao switchDao;
+
 
 
     @Override
@@ -183,4 +187,19 @@ public class SelfPageServiceImpl implements SelfPageService {
         }
         return Result.failed();
     }
+
+
+    @Override
+    public Result updateSwitch(Integer state) {
+        try {
+            if (state == null) {
+                state = 1;
+            }
+            switchDao.update(state);
+            return Result.success("当前开关状态为 : " + state);
+        } catch (Exception e) {
+            logger.error("修改开关状态 error : {}", e);
+        }
+        return Result.failed();
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/LogisticsService.java

+package com.wwdz.ch.wx.service.distribution;
+
+import com.wwdz.ch.core.type.Result;
+
+public interface LogisticsService {
+
+    /**
+     * 查询订单物流轨迹
+     * @param orderId
+     * @return
+     */
+    Result findLogisticsInfo(String orderId);
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/SelfPageService.java

@@ -38,5 +38,11 @@ public interface SelfPageService {
      */
     Result checkIsMine(SelfPageRequestDto dto);
 
+    /**
+     * 审核修改开关状态
+     * @param state
+     * @return
+     */
+    Result updateSwitch(Integer state);
 
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/LogisticsController.java

+package com.wwdz.ch.wx.web.distribution;
+
+import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
+import com.wwdz.ch.wx.entity.request.SelfPageRequestDto;
+import com.wwdz.ch.wx.service.distribution.LogisticsService;
+import com.wwdz.ch.wx.service.distribution.SelfPageService;
+import com.xxdxxs.service.FormHandler;
+import com.xxdxxs.validation.Validator;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/wx/logistics")
+public class LogisticsController {
+
+    private static final Logger logger = LoggerFactory.getLogger(SelfPageController.class);
+
+    @Autowired
+    LogisticsService logisticsService;
+
+
+    @ApiOperation(value = "查询物流轨迹")
+    @PostMapping("/findLogisticsInfo")
+    public Result findLogisticsInfo(@RequestBody DistributionOrderRequestDto dto) {
+        logger.info("查询物流轨迹,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("distributionOrderId", "订单号").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return logisticsService.findLogisticsInfo(dto.getDistributionOrderId());
+    }
+
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/SelfPageController.java

@@ -11,10 +11,9 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.ws.rs.GET;
 
 /**
  * 个人主页
@@ -84,4 +83,10 @@ public class SelfPageController {
         return selfPageService.checkIsMine(dto);
     }
 
+
+    @ApiOperation(value = "修改开关状态")
+    @GetMapping("/updateSwitch")
+    public Result updateSwitch(@RequestParam("state") Integer state) {
+        return selfPageService.updateSwitch(state);
+    }
 }

ch-wx-api/src/test/java/com/wwdz/ch/wx/api/WxPayServiceTest.java

@@ -89,12 +89,12 @@ public class WxPayServiceTest {
 
     @Test
     public void refund() {
-        List<String> list = Arrays.asList("DA2403261800370990846");
+        List<String> list = Arrays.asList("DA2403281652031837271");
         list.forEach(orderId ->{
             DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
             dto.setDistributionOrderId(orderId);
-            dto.setAmount("1.0");
-            dto.setRefundPrice("1.0");
+            dto.setAmount("9.8");
+            dto.setRefundPrice("9.8");
             Result result = wxPayServiceApi.refund(dto);
             logger.info("申请微信支付退款:{}", result);
         });