Merge remote-tracking branch 'origin/dev_v1_1_20220720' into dev_v1_1_20220720

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/MallPortalFeignService.java

@@ -20,6 +20,13 @@ public interface MallPortalFeignService {
     /**
      * 自动收货
      */
-    @GetMapping("/autoReceive")
+    @GetMapping("/task/autoReceive")
     HttpResponseResult autoReceive();
+
+
+    /**
+     * 收货多少天后分润
+     */
+    @GetMapping("/task/shareProfit")
+    HttpResponseResult shareProfit();
 }

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/fallback/MallPortalFeignServiceFallback.java

@@ -20,4 +20,9 @@ public class MallPortalFeignServiceFallback implements MallPortalFeignService {
     public HttpResponseResult autoReceive() {
         return null;
     }
+
+    @Override
+    public HttpResponseResult shareProfit() {
+        return null;
+    }
 }

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrder.java

@@ -139,7 +139,7 @@ public class OmsOrder implements Serializable {
     @ApiModelProperty(value = "评价时间")
     private Date commentTime;
 
-    @ApiModelProperty("是否能申请售后")
+    @ApiModelProperty("是否能申请售后 0:是 1：否")
     private int afterSale;
 
     @ApiModelProperty(value = "修改时间")

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -495,11 +495,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
     @Override
     public void confirmReceiveOrder(Long orderId) {
-        UmsMember member = memberService.getCurrentMember();
+        // UmsMember member = memberService.getCurrentMember();
         OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
-        if (!member.getId().equals(order.getMemberId())) {
-            Asserts.fail("不能确认他人订单！");
-        }
+        // if (!member.getId().equals(order.getMemberId())) {
+        //     Asserts.fail("不能确认他人订单！");
+        // }
         if (order.getStatus() != 2) {
             Asserts.fail("该订单还未发货！");
         }else if (order.getStatus() == 3) {
@@ -805,7 +805,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         OmsOrderExample orderExample = new OmsOrderExample();
         orderExample.createCriteria().andStatusEqualTo(3).andDeleteStatusEqualTo(0).andConfirmStatusEqualTo(1)
                 .andAfterSaleEqualTo(0)
-                    .andDeliveryTimeLessThanOrEqualTo(Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()));
+                .andReceiverCityIsNotNull()
+                    .andReceiveTimeLessThan(Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()));
 
         List<OmsOrder> omsOrders = orderMapper.selectByExample(orderExample);
         if (CollectionUtils.isEmpty(omsOrders)) {
@@ -824,15 +825,14 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
     private void FinishReceiveOrder(Long orderId) {
 
-        UmsMember member = memberService.getCurrentMember();
+        // UmsMember member = memberService.getCurrentMember();
         OmsOrder order = orderMapper.selectByPrimaryKey(orderId);
-        if (!member.getId().equals(order.getMemberId())) {
-            Asserts.fail("不能确认他人订单！");
-        }
+        // if (!member.getId().equals(order.getMemberId())) {
+        //     Asserts.fail("不能确认他人订单！");
+        // }
          if (order.getStatus() != 3) {
             Asserts.fail("未确认收货！");
         }
-        order.setStatus(4);
         order.setAfterSale(1);
         orderMapper.updateByPrimaryKey(order);
 

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/MallShareProfitTask.java

@@ -0,0 +1,22 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.api.feign.MallPortalFeignService;
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 自动分润
+ */
+@Service
+public class MallShareProfitTask extends BaseTask {
+
+    @Autowired
+    private MallPortalFeignService mallPortalFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        Object o = mallPortalFeignService.shareProfit();
+    }
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/PlatformCashAccountRecordMapper.xml

@@ -153,6 +153,5 @@
     <update id="mallRecordedRecord">
 		update platform_cash_account_record set post_status_ = 'RECORDED'
 		where post_status_ = 'WAIT' and order_no_ = #{orderNo} and biz_id_ = #{bizId}
-		and biz_type_ = #{bizType}
 	</update>
 </mapper>