更改零售状态和金额

xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailOutSheetServiceImpl.java

@@ -39,18 +39,8 @@ import com.lframework.xingyun.sc.dto.purchase.receive.GetPaymentDateDto;
 import com.lframework.xingyun.sc.dto.retail.RetailProductDto;
 import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetFullDto;
 import com.lframework.xingyun.sc.dto.retail.out.RetailOutSheetWithReturnDto;
-import com.lframework.xingyun.sc.entity.LogisticsSheetDetail;
-import com.lframework.xingyun.sc.entity.OrderPayType;
-import com.lframework.xingyun.sc.entity.RetailConfig;
-import com.lframework.xingyun.sc.entity.RetailOutSheet;
-import com.lframework.xingyun.sc.entity.RetailOutSheetDetail;
-import com.lframework.xingyun.sc.entity.RetailOutSheetDetailBundle;
-import com.lframework.xingyun.sc.entity.RetailOutSheetDetailLot;
-import com.lframework.xingyun.sc.enums.LogisticsSheetDetailBizType;
-import com.lframework.xingyun.sc.enums.ProductStockBizType;
-import com.lframework.xingyun.sc.enums.RetailOutSheetStatus;
-import com.lframework.xingyun.sc.enums.ScOpLogType;
-import com.lframework.xingyun.sc.enums.SettleStatus;
+import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.enums.*;
 import com.lframework.xingyun.sc.mappers.RetailOutSheetMapper;
 import com.lframework.xingyun.sc.service.logistics.LogisticsSheetDetailService;
 import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService;
@@ -452,9 +442,12 @@ public class RetailOutSheetServiceImpl extends
     // 这里需要重新统计明细信息，因为明细发生变动了
     Wrapper<RetailOutSheet> updateWrapper = Wrappers.lambdaUpdate(RetailOutSheet.class)
         .set(RetailOutSheet::getTotalNum, totalNum).set(RetailOutSheet::getTotalGiftNum, giftNum)
-        .set(RetailOutSheet::getTotalAmount, totalAmount).eq(RetailOutSheet::getId, sheet.getId());
+        .set(RetailOutSheet::getTotalAmount, totalAmount).eq(RetailOutSheet::getId, sheet.getId())
+            .set(RetailOutSheet::getSettleStatus, SettleStatus.SETTLED)
+            ;
     this.update(updateWrapper);
-
+   // sheet.setSettleStatus(SettleStatus.SETTLED);
+    this.sendApprovePassEvent(sheet);
     OpLogUtil.setVariable("code", sheet.getCode());
     OpLogUtil.setExtra(vo);
   }

xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sale/SaleOrderServiceImpl.java

@@ -695,7 +695,6 @@ public class SaleOrderServiceImpl extends BaseMpServiceImpl<SaleOrderMapper, Sal
     event.setTotalAmount(order.getTotalAmount());
     event.setApproveTime(order.getApproveTime());
     event.setCreateUser(order.getCreateBy());
-    event.setCreateUser(order.getCreateBy());
     ApplicationUtil.publishEvent(event);
   }
 }