Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -987,6 +987,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //后台录单
             add.setOrderUncollected(BigDecimal.ZERO);
             add.setOrderReceived(add.getPayPrice());
+            add.setAccomplishTime(DateUtils.getNowTime());
         }else {
             add.setOrderUncollected(add.getPayPrice());
             add.setOrderReceived(BigDecimal.ZERO);

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -486,6 +486,7 @@ public class WxPayServiceImpl implements IWxPayService {
             order.setOrderReceived(payPrice);//实收
             order.setCreditStatus(1);
             order.setFinishStatus(1);//完单
+            order.setAccomplishTime(DateUtils.getNowTime());//完单时间
             //处理分成
             if (StringUtils.isNotBlank(order.getCostJson())){
                 handleDivide(order);