Merge branch 'master' of http://git.zonelife.cn:3000/fubojin/smqjh

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

@@ -111,7 +111,7 @@ public class ConfirmOrderListener {
                     //费用按重量计算,数据是g,现在要按kg计算，20是kg单位
                     Double totalWeight = shopCartOrderDto.getTotalWeight();
                     Double deliveryWeight = Arith.mul(transport2.getWeight(), 1000);
-                    transfee=calcDeliveryFee(totalWeight, deliveryWeight, new BigDecimal(transport2.getFreightFee().doubleValue())).doubleValue();
+                    transfee = calcDeliveryFee(totalWeight, deliveryWeight, new BigDecimal(transport2.getFreightFee().doubleValue())).doubleValue();
                     break;
                 case 2: //夫妻店，B端只走物流
                     orderParam.setDvyType(DvyType.DELIVERY.value());
@@ -146,7 +146,7 @@ public class ConfirmOrderListener {
         shopCartOrderDto.setFreeTransfee(freeTransfee);
     }
 
-    public static BigDecimal calcDeliveryFee(Double totalWeight,Double deliveryWeight ,BigDecimal unitFare) {
+    public static BigDecimal calcDeliveryFee(Double totalWeight, Double deliveryWeight, BigDecimal unitFare) {
         if (totalWeight == null || totalWeight <= 0 || unitFare == null || unitFare.signum() <= 0) {
             return BigDecimal.ZERO;
         }

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/OrderRefundVo.java

@@ -178,9 +178,18 @@ public class OrderRefundVo implements Serializable{
     private Boolean handler;
 
     /**
-     * 积分
+     * 订单抵扣积分
      */
     private Long offsetPoints;
+    /**
+     * 订单抵扣积分
+     */
+    private Long OrderOffsetPoints;
+    /**
+     * 订单实际总值（用户实付）积分
+     */
+    private Long OrderActualTotal;
+
     /**
      * 过期的积分
      */

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

@@ -70,15 +70,19 @@ public class OrderTask {
         Date now = new Date();
         logger.info("取消超时未支付订单。。。");
         // 获取15分钟之前未支付的订单
-        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -15));
+        List<Order> orders = orderService.cancelOrders(OrderStatus.UNPAY.value(),DateUtil.offsetMinute(now, -15));
         if (CollectionUtil.isEmpty(orders)) {
             return;
         }
 
         List<Order>  cancelOrderList = this.chackOrders(orders);
-        orderService.cancelOrders(cancelOrderList);
+
+
+        //TODO zx定时任务加回积分待完善
+//        orderService.cancelOrders(orders);
+
         // 移除缓存
-        this.removeCache(cancelOrderList);
+        this.removeCache(orders);
 
     }
 
@@ -89,7 +93,7 @@ public class OrderTask {
         Date now = new Date();
         logger.info("系统自动确认收货订单。。。");
         // 获取10天之前等待确认收货的订单
-        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.CONSIGNMENT.value(),DateUtil.offsetDay(now, -10));
+        List<Order> orders = orderService.listUnRefundOrderAndOrderItems(OrderStatus.RECEIVED.value(),DateUtil.offsetDay(now, -10));
         if (CollectionUtil.isEmpty(orders)) {
             return;
         }

yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java

@@ -31,6 +31,7 @@ public interface OrderMapper extends BaseMapper<Order> {
     Order getOrderByOrderNumber(@Param("orderNumber") String orderNumber);
 
     List<Order> listUnRefundOrderAndOrderItems(@Param("orderStatus") Integer orderStatus, @Param("lessThanUpdateTime") DateTime lessThanUpdateTime);
+    List<Order> cancelOrders(@Param("orderStatus") Integer orderStatus, @Param("lessThanUpdateTime") DateTime lessThanUpdateTime);
 
     void cancelOrders(@Param("orders") List<Order> orders);
 

yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java

@@ -82,8 +82,20 @@ public interface OrderService extends IService<Order> {
 
     void delivery(Order order);
 
+    /**
+     * 获取送达的订单项
+     * @param orderStatus 订单状态
+     * @param lessThanUpdateTime 时间
+     * @return
+     */
     List<Order> listUnRefundOrderAndOrderItems(Integer orderStatus, DateTime lessThanUpdateTime);
 
+    /**
+     * @param orderStatus 订单状态
+     * @param lessThanUpdateTime 时间
+     */
+    List<Order> cancelOrders(Integer orderStatus, DateTime lessThanUpdateTime);
+
     void cancelOrders(List<Order> orders);
 
     void receiptOrder(List<Order> orders);

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

@@ -70,7 +70,6 @@ public class HBGoodsService implements IHBGoodsService {
                 JSONObject innerResult = result.getJSONObject("result");
                 JSONArray productHostInfoDTOS = innerResult.getJSONArray("productHostInfoDTOS");
 
-
                 // 3. 遍历获取每个商品信息
                 for (int i = 0; i < productHostInfoDTOS.size(); i++) {
                     JSONObject productInfo = productHostInfoDTOS.getJSONObject(i);

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

@@ -10,6 +10,8 @@ import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.dao.CategoryProdMapper;
 import com.yami.shop.service.CategoryProdService;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,7 @@ import java.util.List;
  * Created by lgh on 2018/07/13.
  */
 @Service
+@Slf4j
 public class CategoryProdServiceImpl extends ServiceImpl<CategoryProdMapper, CategoryProd> implements CategoryProdService {
 
     @Autowired
@@ -62,6 +65,7 @@ public class CategoryProdServiceImpl extends ServiceImpl<CategoryProdMapper, Cat
                     .eq(CategoryProd::getCode, categoryProductDTO.getParentCode())
                     .eq(CategoryProd::getShopId, categoryProductDTO.getShopId())
                     .eq(CategoryProd::getIsDelete, 0));
+            log.info("查看父类绑定商品是否存在不存在添加:{}", integer1);
             if (integer1 == 0) {
                 CategoryProd categoryProdParent = new CategoryProd();
                 categoryProdParent.setCategoryId(categoryProductDTO.getCategoryId());
@@ -85,16 +89,18 @@ public class CategoryProdServiceImpl extends ServiceImpl<CategoryProdMapper, Cat
 
         for (Long aLong : prodIdList) {
 
-            CategoryProd categoryProd = categoryPropMapper.selectOne(new LambdaQueryWrapper<CategoryProd>().eq(CategoryProd::getProdId, aLong)
+            List<CategoryProd> categoryProdList = categoryPropMapper.selectList(new LambdaQueryWrapper<CategoryProd>().eq(CategoryProd::getProdId, aLong)
                     .eq(CategoryProd::getIsDelete, 0)
                     .eq(CategoryProd::getShopId, categoryProductDTO.getShopId())
                     .eq(CategoryProd::getCode, categoryProductDTO.getCode()));
 
-            if (ObjectUtils.isEmpty(categoryProd)) {
+            if (ObjectUtils.isEmpty(categoryProdList)) {
                 new GlobalException("该门店分类对应商品ID=" + aLong + " 不存在！请勿重复取消");
             }
-            categoryProd.setIsDelete(1);
-            categoryPropMapper.deleteById(categoryProd);
+            for (CategoryProd categoryProd : categoryProdList) {
+                categoryProd.setIsDelete(1);
+                categoryPropMapper.deleteById(categoryProd);
+            }
         }
 
     }

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

@@ -254,6 +254,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     public List<Order> listUnRefundOrderAndOrderItems(Integer orderStatus, DateTime lessThanUpdateTime) {
         return orderMapper.listUnRefundOrderAndOrderItems(orderStatus, lessThanUpdateTime);
     }
+    @Override
+    public List<Order> cancelOrders(Integer orderStatus, DateTime lessThanUpdateTime) {
+        return orderMapper.cancelOrders(orderStatus, lessThanUpdateTime);
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

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

@@ -229,6 +229,12 @@
     and o.dvy_time < #{lessThanUpdateTime}
   </select>
 
+    <select id="cancelOrders" resultMap="orderAndOrderItemMap">
+    select o.*,oi.*,oi.prod_name oi_prod_name,oi.actual_total as oi_actual_total from tz_order o
+      join tz_order_item oi on o.order_number = oi.order_number
+    where o.hb_order_status = #{orderStatus}  and o.create_time &lt; #{lessThanUpdateTime}
+  </select>
+
     <update id="cancelOrders">
         update tz_order set `hb_order_status`=60,cancel_time = NOW(),update_time=NOW(),close_type=4  where order_id in
         <foreach collection="orders" item="order" open="(" close=")" separator=",">

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

@@ -507,6 +507,8 @@
                o.actual_total    as actualTotal,
                o.product_nums    as productNums,
                o.hb_order_status as hbOrderStatus,
+               o.offset_points as OrderOffsetPoints,
+               o.actual_total as OrderActualTotal,
                tsd.shop_name     as shopName,
                uao.receiver        as receiver
         from tz_order_refund refund