no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/PartsRefundRecordDTO.java

@@ -93,10 +93,10 @@ public class PartsRefundRecordDTO {
         this.isBackup = itemRecordDTO.getIsBackup();
         this.createTime = DateUtil.date();
         this.refundAmountMode = salesOrderItem.getRefundAmountMode();
-        if (refType.equals(PartsRefTypeEnum.OLD_REFUND.getKey()) || refType.equals(PartsRefTypeEnum.NEW_REFUND.getKey())) {
+        if (refType.equals(PartsRefTypeEnum.OLD_REFUND.getRemark()) || refType.equals(PartsRefTypeEnum.NEW_REFUND.getRemark())) {
             // 旧件返还保内或新件返还 全额退还
             this.refundAmount = salesOrderItem.getSalesPrice().multiply(qty);
-        } else if (refType.equals(PartsRefTypeEnum.OUTSIDE_TO_SALES.getKey())) {
+        } else if (refType.equals(PartsRefTypeEnum.OUTSIDE_TO_SALES.getRemark())) {
             // 保外新件转销售的市场价-优惠价2的差价退还（旧计算方式）
 //            this.refundAmount = salesOrderItem.getMarketPrice().subtract(salesOrderItem.getSecondPrice()).multiply(qty);
             // 销售价-优惠价2*1.2倍  返还差价

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/parts/OldRefundManageLogic.java

@@ -225,19 +225,22 @@ public class OldRefundManageLogic {
 
             return sheetId;
         } catch (Exception e) {
-            final Integer count = workerSalesCustomerInfoService.lambdaQuery()
+            WorkerSalesCustomerInfo info = workerSalesCustomerInfoService.lambdaQuery()
                     .eq(WorkerSalesCustomerInfo::getCompanyWechatId, bean.getCompanyWechatId())
                     .eq(WorkerSalesCustomerInfo::getWorkOrderNo, bean.getWorkOrderNo())
                     .eq(WorkerSalesCustomerInfo::getRepairFlag, bean.getRepairFlag())
-                    .count();
+                    .one();
 
-            if (count == 0) {
-                WorkerSalesCustomerInfo info = new WorkerSalesCustomerInfo();
+            if (Objects.isNull(info)) {
+                info = new WorkerSalesCustomerInfo();
                 info.setErr(e.getMessage())
                         .setSalesCustomerJson(JSONUtil.toJsonStr(bean))
                         .setIdentity(bean.getIdentity())
                         .setCompanyWechatId(bean.getCompanyWechatId())
                         .insert();
+            } else {
+                info.setErr(e.getMessage())
+                        .updateById();
             }
         }
         return null;
@@ -312,7 +315,6 @@ public class OldRefundManageLogic {
     }
 
     private OldRefundManageBean convertBean(SalesCustomerPartsBean bean, AdminWebsit websit, Map<String, WebsitGoods> partsMap) {
-        CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat();
         OldRefundManageBean oldRefundManageBean = new OldRefundManageBean();
         BeanUtils.copyProperties(bean, oldRefundManageBean);
         if (PartsRepairFlagEnum.INNER.getKey().equals(bean.getRepairFlag())) {
@@ -322,9 +324,9 @@ public class OldRefundManageLogic {
         }
         oldRefundManageBean.setReceiveWebsitName(websit.getName());
         oldRefundManageBean.setWebsitAddress(websit.getAddress());
-        oldRefundManageBean.setCreateBy(wechat.getUser().getNickName());
+        oldRefundManageBean.setCreateBy(bean.getWorkerName());
         oldRefundManageBean.setCreateTime(DateUtil.date());
-        oldRefundManageBean.setUpdateBy(wechat.getUser().getNickName());
+        oldRefundManageBean.setUpdateBy(bean.getWorkerName());
         oldRefundManageBean.setUpdateTime(DateUtil.date());
         oldRefundManageBean.setFlag(PartsOrderFlagEnum.SAVE.toString());
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockPVO.java

@@ -56,6 +56,14 @@ public class WorkerStockPVO {
     private BigDecimal qty;
     @ApiModelProperty("旧件库存")
     private BigDecimal oldQty;
+    @ApiModelProperty("在途库存")
+    private BigDecimal wayQty;
+    @ApiModelProperty("临占新件库存")
+    private BigDecimal tempNewQty;
+    @ApiModelProperty("临占旧件库存")
+    private BigDecimal tempOldQty;
+    @ApiModelProperty("转销售库存")
+    private BigDecimal changeSalesQty;
     @ApiModelProperty("更新时间")
     private Date updateTime;