生成二维码

ch-dao/src/main/resources/generatorConfig_new.xml

@@ -72,7 +72,7 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper.distribution"
                              targetProject="ch-dao/src/main/java"/>
 
-        <table tableName="distribution_order" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
+        <table tableName="shop_white_list" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
             <generatedKey column="id" sqlStatement="Mysql" identity="true" />
         </table>
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/AcodeRequestDto.java

+package com.wwdz.ch.wx.entity.request;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+@Data
+public class AcodeRequestDto implements Entity {
+
+    private String page;
+
+    private String scene;
+
+    private Integer loginType;
+
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/SupplierItemVo.java

@@ -12,6 +12,8 @@ public class SupplierItemVo implements Entity {
 
     private Long id;
 
+    private Long itemId;
+
     /**
      * 商品名称
      */

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

@@ -69,16 +69,19 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Override
     public Result findDetail(SupplierItemRequestDto dto) {
         try {
-            SupplierItem supplierItem = supplierItemDao.findById(dto.getId());
+            Long itemId = dto.getId();
             SupplierItemVo supplierItemVo = new SupplierItemVo();
-            EntityMapper.copyAttribute(supplierItem, supplierItemVo);
-            supplierItemVo.setSupplyPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getSupplyPrice()));
-            supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
-            supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
             if (StringUtils.hasLength(dto.getShareRecordId())) {
                 DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById(dto.getShareRecordId());
                 supplierItemVo.setSalePrice(PriceUtil.convertPriceFenToYuan(distributorShareRecord.getPrice()));
+                itemId = distributorShareRecord.getItemId();
             }
+            SupplierItem supplierItem = supplierItemDao.findById(itemId);
+            EntityMapper.copyAttribute(supplierItem, supplierItemVo);
+            supplierItemVo.setItemId(supplierItem.getId());
+            supplierItemVo.setSupplyPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getSupplyPrice()));
+            supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
+            supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
             return Result.success(supplierItemVo);
         } catch (Exception e) {
             logger.error("供应商商品详情查询失败 error : {}", e);

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

@@ -3,6 +3,7 @@ package com.wwdz.ch.wx.web;
 import com.alibaba.fastjson.JSON;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dto.request.ConsignSaleRequestDto;
+import com.wwdz.ch.wx.entity.request.AcodeRequestDto;
 import com.wwdz.ch.wx.entity.request.ItemRequestDto;
 import com.wwdz.ch.wx.service.ConsignSaleService;
 import com.wwdz.ch.wx.service.ItemService;

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

@@ -4,6 +4,9 @@ import com.github.binarywang.wxpay.service.WxPayService;
 import com.wwdz.ch.core.api.OfficialAccountApi;
 import com.wwdz.ch.core.api.wxpay.WxPayServiceApi;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.PriceUtil;
+import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.domain.distribution.DistributionOrder;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -13,6 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.Arrays;
+import java.util.List;
+
 @SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
 public class WxPayServiceTest {
@@ -22,6 +28,9 @@ public class WxPayServiceTest {
     @Autowired
     WxPayServiceApi wxPayServiceApi;
 
+    @Autowired
+    DistributionOrderDao distributionOrderDao;
+
     @Test
     public void queryOrderBytOutTradeNo() {
         String orderId = "DA2401311023019918454";
@@ -34,13 +43,15 @@ public class WxPayServiceTest {
 
     @Test
     public void refund() {
-        String orderId = "DA2402051545434693338";
+        List<String> list = Arrays.asList("DA2402061728218723255");
+        list.forEach(orderId ->{
             DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
             dto.setDistributionOrderId(orderId);
-        dto.setAmount("0.1");
-        dto.setRefundPrice("0.1");
+            dto.setAmount("0.11");
+            dto.setRefundPrice("0.11");
             Result result = wxPayServiceApi.refund(dto);
             logger.info("申请微信支付退款:{}", result);
+        });
     }