Merge remote-tracking branch 'origin/master'

yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java

@@ -50,12 +50,8 @@ public class PayController {
     @SneakyThrows
     @PostMapping("/refund")
     @ApiOperation(value = "测试退款")
-    public ResponseEntity<?> refund() {
-        RefundInfoPo po = new RefundInfoPo();
-        po.setOutTradeNo("1981204768344903680");
-        po.setTotal(310);
-        po.setRefundMoney(310);
-        return ResponseEntity.ok(wxProviderService.refundOrder(po));
+    public ResponseEntity<?> refund(@RequestBody RefundInfoPo refundInfo) {
+        return ResponseEntity.ok(wxProviderService.refundOrder(refundInfo));
     }
 
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/RefundAddrApiController.java

@@ -0,0 +1,106 @@
+package com.yami.shop.api.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yami.shop.bean.model.RefundAddr;
+import com.yami.shop.common.annotation.SysLog;
+import com.yami.shop.common.util.PageParam;
+import com.yami.shop.common.util.R;
+import com.yami.shop.security.api.util.SecurityUtils;
+import com.yami.shop.service.RefundAddrService;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/p/refundAddr")
+public class RefundAddrApiController {
+
+    private final RefundAddrService refundAddrService;
+
+    /**
+     * 分页查询
+     *
+     * @param page       分页对象
+     * @param refundAddr
+     * @return 分页数据
+     */
+    @GetMapping("/page")
+    public ResponseEntity<IPage<RefundAddr>> getRefundAddrPage(PageParam<RefundAddr> page, RefundAddr refundAddr) {
+        return ResponseEntity.ok(refundAddrService.page(page, new LambdaQueryWrapper<RefundAddr>()
+                .ne(RefundAddr::getStatus, -1)));
+    }
+
+
+    /**
+     * 通过id查询
+     *
+     * @param refundAddrId id
+     * @return 单个数据
+     */
+    @GetMapping("/info/{refundAddrId}")
+    public ResponseEntity<RefundAddr> getById(@PathVariable("refundAddrId") Long refundAddrId) {
+        RefundAddr refundAddr = refundAddrService.getById(refundAddrId);
+        return ResponseEntity.ok(refundAddr);
+    }
+
+    /**
+     * 新增
+     *
+     * @param refundAddr
+     * @return 是否新增成功
+     */
+    @SysLog("新增")
+    @PostMapping
+    public R<String> save(@RequestBody @Valid RefundAddr refundAddr) {
+        Date now = new Date();
+        refundAddr.setCreateTime(now);
+        refundAddr.setUpdateTime(now);
+        refundAddrService.addRefundAddr(refundAddr);
+        return R.SUCCESS("添加成功");
+    }
+
+    /**
+     * 修改
+     *
+     * @param refundAddr
+     * @return 是否修改成功
+     */
+    @SysLog("修改")
+    @PutMapping
+    public ResponseEntity<String> updateById(@RequestBody @Valid RefundAddr refundAddr) {
+        refundAddr.setUpdateTime(new Date());
+        refundAddrService.updateById( refundAddr);
+        return ResponseEntity.ok().body("修改成功");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param refundAddrId id
+     * @return 是否删除成功
+     */
+    @SysLog("删除")
+    @DeleteMapping("/{refundAddrId}")
+    public ResponseEntity<Boolean> removeById(@PathVariable Long refundAddrId) {
+        return ResponseEntity.ok(refundAddrService.removeById(refundAddrId));
+    }
+
+    /**
+     * 获取店铺的所有收获地址
+     */
+    @GetMapping("/list")
+    public ResponseEntity<List<RefundAddr>> list() {
+        List<RefundAddr> list = refundAddrService.list(new LambdaQueryWrapper<RefundAddr>()
+                .eq(RefundAddr::getStatus, 1)
+                .orderByDesc(RefundAddr::getUpdateTime));
+        return ResponseEntity.ok(list);
+    }
+
+}

yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java

@@ -199,7 +199,7 @@ public class SubmitOrderListener {
                         //后台充值的积分
                         if (1 == mergerOrder.getPlatform() && null != point && point > 0) {
                             Double useActualItem = actualItem;
-                            if (!isUseTransfee) {//每个订单增加手续费，都只扣一次
+                            if (!isUseTransfee) {//每个订单增加运费，都只扣一次
                                 Double transfee = shopCartOrderDto.getTransfee();
                                 useActualItem = Arith.add(useActualItem, transfee);
                                 isUseTransfee = Boolean.TRUE;

yami-shop-platform/src/main/java/com/yami/shop/platform/task/OrderTask.java

@@ -62,41 +62,12 @@ public class OrderTask {
     @Autowired
     private PayManagerService payManagerService;
 
-//    @Autowired
-//    private PaoTuiApi paoTuiApi;
-//
-//    @Autowired
-//    private OrderRefundService orderRefundService;
-//
-//    @Autowired
-//    private OrderItemService orderItemService;
-//
-//    @Autowired
-//    private UserAddrOrderService userAddrOrderService;
-//
-//    @Autowired
-//    private DeliveryOrderService deliveryOrderService;
-//
-//    @Autowired
-//    private IQnhService qnhService;
-//
-//    @Autowired
-//    private UserService userService;
-//
-//    @Autowired
-//    private ShopDetailService shopDetailService;
-//    @Autowired
-//    private DeviceFeyMapper deviceFeyMapper;
-
-
-
-
 
     public void cancelOrder(){
         Date now = new Date();
         logger.info("取消超时未支付订单。。。");
         // 获取30分钟之前未支付的订单
-        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -30));
+        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -15));
         if (CollectionUtil.isEmpty(orders)) {
             return;
         }

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBOrderService.java

@@ -187,11 +187,9 @@ public class HBOrderService implements IHBOrderService {
         Order order = orderMapper.getOrderAndOrderItemByOrderNumber(channelOrderId);
         //如果是已送达直接完成并且通知海博
         order.setHbOrderStatus(operatorType);
-//        if (operatorType == 70) {
-//            order.setHbOrderStatus(80);
-//        } else if (operatorType == 60) {
-//            order.setHbOrderStatus(60);
-//        }
+        if (operatorType == 70 || order.getDvyType() == 3) {
+            order.setHbOrderStatus(80);
+        }
         orderMapper.updateById(order);
 
 
@@ -236,9 +234,9 @@ public class HBOrderService implements IHBOrderService {
 
         }
         //成功直接通知海博
-//        if (operatorType == 70) {
-//            changeOrderStatus(channelOrderId, OrderStatus.SUCCESS.value());
-//        }
+        if (order.getHbOrderStatus() == 80) {
+            changeOrderStatus(channelOrderId, OrderStatus.SUCCESS.value());
+        }
     }
 
     @Override

yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java

@@ -10,7 +10,6 @@
 
 package com.yami.shop.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -27,12 +26,10 @@ import com.yami.shop.bean.vo.ListCategoryForUserVO;
 import com.yami.shop.bean.vo.ListCategoryVO;
 import com.yami.shop.common.config.Constant;
 import com.yami.shop.common.exception.GlobalException;
-import com.yami.shop.config.ShopConfig;
 import com.yami.shop.dao.*;
 import com.yami.shop.service.CategoryService;
 import com.yami.shop.service.SysConfigService;
 import lombok.AllArgsConstructor;
-import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -44,8 +41,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.groupingBy;
-
 /**
  * @author LGH
  */
@@ -54,7 +49,6 @@ import static java.util.stream.Collectors.groupingBy;
 public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> implements CategoryService {
 
     private final CategoryMapper categoryMapper;
-    private final ShopConfig shopConfig;
 
     private final CategoryBrandMapper categoryBrandMapper;
 
@@ -86,7 +80,6 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-//	@CacheEvict(cacheNames = "CategoryListByParentIdAndShopId", key = "#category.parentId + ':' + #category.shopId")
     @Caching(evict = {
             @CacheEvict(cacheNames = "CategoryListByParentIdAndShopId", key = "#category.parentId + ':' + #category.shopId"),
             @CacheEvict(cacheNames = "CategoryListByShopId", key = "#category.shopId + ':category'")

yami-shop-service/src/main/java/com/yami/shop/service/impl/RefundAddrServiceImpl.java

@@ -24,9 +24,9 @@ public class RefundAddrServiceImpl extends ServiceImpl<RefundAddrMapper, RefundA
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addRefundAddr(RefundAddr refundAddr) {
-        if (Objects.equals(refundAddr.getDefaultAddr(), 1)) {
-            refundAddrMapper.cancelDefaultAddr(refundAddr.getShopId());
-        }
+//        if (Objects.equals(refundAddr.getDefaultAddr(), 1)) {
+//            refundAddrMapper.cancelDefaultAddr(refundAddr.getShopId());
+//        }
         refundAddrMapper.insert(refundAddr);
     }
 

yami-shop-service/src/main/resources/mapper/OrderMapper.xml

@@ -655,7 +655,7 @@
             AND
             <choose>
                 <when test="20 == status">
-                    temp.hb_order_status IN (1,20,30,40,70)
+                    temp.hb_order_status IN (1,20,30,40,50,70)
                 </when>
                 <otherwise>
                     temp.hb_order_status = #{status}
@@ -709,10 +709,10 @@
         SELECT
         COUNT(o.order_id) all_count,
         COUNT( CASE WHEN o.hb_order_status = 0 THEN o.order_id ELSE NULL END ) AS unPay,
-        COUNT( CASE WHEN o.hb_order_status = 20 THEN o.order_id ELSE NULL END ) AS payed,
-        COUNT( CASE WHEN o.hb_order_status = 30 THEN o.order_id ELSE NULL END ) AS consignment,
+        COUNT( CASE WHEN o.hb_order_status = 1 THEN o.order_id ELSE NULL END ) AS payed,
+        COUNT( CASE WHEN o.hb_order_status in (1,20,30,40,50,70) THEN o.order_id ELSE NULL END ) AS consignment,
         COUNT( CASE WHEN o.hb_order_status = 40 THEN o.order_id ELSE NULL END ) AS confirm,
-        COUNT( CASE WHEN o.hb_order_status = 50 THEN o.order_id ELSE NULL END ) AS success,
+        COUNT( CASE WHEN o.hb_order_status = 80 THEN o.order_id ELSE NULL END ) AS success,
         COUNT( CASE WHEN o.hb_order_status = 60 THEN o.order_id ELSE NULL END ) AS `close`
         FROM tz_order o
         WHERE o.user_id =#{userId} AND o.delete_status = 0

yami-shop-user/yami-shop-user-comment/src/main/java/com/yami/shop/user/comment/service/impl/UserScoreDetailServiceImpl.java

@@ -168,7 +168,6 @@ public class UserScoreDetailServiceImpl extends ServiceImpl<UserScoreDetailMappe
                     int remainingPoints = pointsRecord.getPoints().intValue() - variablePoints;
 
                     if (remainingPoints > 0 && isExpiredToday(pointsRecord.getExpiryDate())) {
-
                         PointsRecord expiredRecord = new PointsRecord();
                         // 复制关键属性（根据实际属性补充）
                         expiredRecord.setId(pointsRecord.getId()); // 若ID唯一需注意业务逻辑

yami-shop-wx/src/main/java/com/yami/shop/wx/po/RefundInfoPo.java

@@ -21,11 +21,11 @@ public class RefundInfoPo {
     @NotNull(message = "订单号不能为空...")
     private String outTradeNo;
 
-    @ApiModelProperty(value = "总金额")
+    @ApiModelProperty(value = "总金额(分)")
     @NotNull(message = "总金额不能为空...")
     private Integer total;
 
-    @ApiModelProperty(value = "退款金额")
+    @ApiModelProperty(value = "退款金额(分)")
     @NotNull(message = "退款金额不能为空...")
     private Integer refundMoney;
 }