后台商品维护

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -71,8 +71,8 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             if (StringUtils.hasLength(dto.getSupplyPrice())) {
                 supplierItem.setSupplyPrice(PriceUtil.convertPriceFromStr(dto.getSupplyPrice()));
             }
-            supplierItem.setImages(org.apache.commons.lang3.StringUtils.join(dto.getImages(), ";"));
-            supplierItem.setVideos(org.apache.commons.lang3.StringUtils.join(dto.getVideos(), ";"));
+            supplierItem.setImages(dto.getImages());
+            supplierItem.setVideos(dto.getVideos());
             supplierItem.setSort(1);
             supplierItem.setCreateTime(now);
             supplierItem.setUpdateTime(now);
@@ -167,8 +167,8 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             if (StringUtils.hasLength(dto.getSupplyPrice())) {
                 supplierItem.setSupplyPrice(PriceUtil.convertPriceFromStr(dto.getSupplyPrice()));
             }
-            supplierItem.setImages(org.apache.commons.lang3.StringUtils.join(dto.getImages(), ";"));
-            supplierItem.setVideos(org.apache.commons.lang3.StringUtils.join(dto.getVideos(), ";"));
+            supplierItem.setImages(dto.getImages());
+            supplierItem.setVideos(dto.getVideos());
             supplierItemDao.update(supplierItem);
             return Result.success();
         } catch (Exception e) {

ch-core/src/main/java/com/wwdz/ch/core/api/wxpay/WxPayServiceApi.java

@@ -314,9 +314,18 @@ public class WxPayServiceApi {
      */
     public Result closeOrder(DistributionOrderRequestDto dto){
         try {
+            //请求微信支付相关配置
+            JsapiServiceExtension service = new JsapiServiceExtension.Builder()
+                    .config(rsaAutoCertificateConfig)
+                    .signType("RSA") // 不填默认为RSA
+                    .build();
+            CloseOrderRequest request = new CloseOrderRequest();
+            request.setOutTradeNo(dto.getDistributionOrderId());
+            request.setMchid(wxPayProperties.getMerchantId());
+            service.closeOrder(request);
             return Result.success();
         }catch (Exception e){
-            logger.error("微信退款接口错误error : {}", e);
+            logger.error("微信支付关闭订单错误error : {}", e);
         }
         return Result.failed();
     }

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SupplierItemRequestDto.java

@@ -54,12 +54,12 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
     /**
      * 商品图片,分号分隔
      */
-    private String[] images;
+    private String images;
 
     /**
      * 商品视频,分号分隔
      */
-    private String[] videos;
+    private String videos;
 
     /**
      * 限购数量

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

@@ -39,6 +39,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         JdbcHelper.ifPresent(dto.getStock(), criteria::andStockGreaterThan);
         JdbcHelper.ifPresent(dto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
         JdbcHelper.ifPresent(dto.getIsDeleted(), criteria::andIsDeletedEqualTo);
+        criteria.andIsDeletedEqualTo(false);
         supplierItemExample.setOrderByClause(" id desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return supplierItemMapper.selectByExampleWithBLOBs(supplierItemExample);

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

@@ -3,11 +3,17 @@ package com.wwdz.ch.wx.api;
 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.consts.ResultCode;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.IdUtils;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.UUID;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.dao.distribution.DistributorShareRecordDao;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.distribution.DistributionOrder;
+import com.wwdz.ch.db.domain.distribution.DistributorShareRecord;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,6 +22,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -32,15 +39,53 @@ public class WxPayServiceTest {
     @Autowired
     DistributionOrderDao distributionOrderDao;
 
+    @Autowired
+    SupplierItemDao supplierItemDao;
+
+    @Autowired
+    DistributorShareRecordDao distributorShareRecordDao;
+
     @Test
     public void queryOrderBytOutTradeNo() {
-        String orderId = "DA2401311023019918454";
+        String orderId = "DA2403041820219215800";
         DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
         dto.setDistributionOrderId(orderId);
         Result result = wxPayServiceApi.queryOrderBytOutTradeNo(dto);
         logger.info("查询支付状态:{}", result);
     }
 
+    @Test
+    public void getParam() {
+        String prepayId = "wx04182022129559e96e5ef8653e13590000";
+        Result result = wxPayServiceApi.wxAppPayTuneUp(prepayId);
+        logger.info("获取支付参数:{}", result);
+    }
+
+
+    @Test
+    public void prepay() {
+      /*  DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
+        dto.setDistributionOrderId("DA2403041819516253740");
+        wxPayServiceApi.closeOrder(dto);
+        String prepayId = "wx04182022129559e96e5ef8653e13590000";*/
+        String orderId = "DA2403041819516253740";
+        DistributionOrderRequestDto dto2 = new DistributionOrderRequestDto();
+        dto2.setDistributionOrderId(orderId);
+        Result result = wxPayServiceApi.queryOrderBytOutTradeNo(dto2);
+        logger.info("查询支付状态:{}", result);
+
+        String distributionOrderId = "DA2403041819516253740";
+        DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById("8991620b-5ae3-408c-b43f-5a76241ea208");
+        SupplierItem supplierItem = supplierItemDao.findById(distributorShareRecord.getItemId());
+        DistributionOrderRequestDto prePayDto = new DistributionOrderRequestDto();
+        prePayDto.setDistributionOrderId(distributionOrderId);
+        prePayDto.setAmount(String.valueOf(distributorShareRecord.getPrice()));
+        prePayDto.setBuyerOpenid("okGT15JamxpzlG7v7upYOIVXQmh8");
+        prePayDto.setItemName(supplierItem.getName());
+        Result prePayResult = wxPayServiceApi.createPrepareOrder(prePayDto);
+        logger.info("prepay:{}", prePayResult);
+    }
+
 
     @Test
     public void refund() {