Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/java/org/rcisoft/bus/custrecharge/entity/CustRecharge.java

@@ -127,5 +127,10 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
       */
      @TableField(exist = false)
      private String storeName;
+
+     /**
+      * 是否为退款
+      */
+     private String isReturn;
 }
 

src/main/java/org/rcisoft/bus/custrecharge/service/impl/CustRechargeServiceImpl.java

@@ -28,6 +28,7 @@ import org.rcisoft.core.model.CyPageInfo;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -58,12 +59,18 @@ public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository,
     public CyPersistModel persist(CustRecharge custRecharge){
 
         custRecharge.setStoreId(CyUserUtil.getAuthenDept());
-        if(custRecharge.getOrderNumber() != null){
+        if(custRecharge.getOrderNumber() != null && custRecharge.getIsReturn() == null){
             //根据id修改余额
             CustInfo custInfo = custInfoServiceImpl.findById(custRecharge.getCustomerId());
             BigDecimal newBalance = custInfo.getCustomerBalance().subtract(custRecharge.getConsumptionAmount());
             custInfo.setCustomerBalance(newBalance);
             custInfoServiceImpl.merge(custInfo);
+        }else if(Objects.equals(custRecharge.getIsReturn(), "1")){
+            CustInfo custInfo = custInfoServiceImpl.findById(custRecharge.getCustomerId());
+            BigDecimal newBalance = custInfo.getCustomerBalance().add(custRecharge.getActualReceipt());
+            custInfo.setCustomerBalance(newBalance);
+            custRecharge.setCustomerBalance(newBalance);
+            custInfoServiceImpl.merge(custInfo);
         }
 
         //增加操作

src/main/java/org/rcisoft/bus/storegoodsapply/entity/StoreGoodsApply.java

@@ -163,5 +163,7 @@ public class StoreGoodsApply extends CyIdIncreEntity<StoreGoodsApply> {
 
      private String payType;
 
+     private Integer customerId;
+
 }
 

src/main/java/org/rcisoft/bus/storegoodslog/entity/StoreGoodsLog.java

@@ -2,6 +2,7 @@ package org.rcisoft.bus.storegoodslog.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;