修改交班落地数据逻辑

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java

@@ -19,6 +19,7 @@ public class TbOrderDetail implements Serializable {
     private Integer productSkuId;
 
     private Integer num;
+    private Integer returnNum;
 
     private String productName;
     private String status;

src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java

@@ -70,11 +70,11 @@ public class DutyService {
                 ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day);
 //                ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByTokenIdAndTradeDay(tokenId, day, orderInfo.getShopId());
                 BigDecimal cashAmount = BigDecimal.ZERO;
-                if (orderInfo.getPayType().equals("cash")) {
-                    cashAmount = orderInfo.getPayAmount();
-                }
 
                 if (type.equals("create")) {
+                    if (orderInfo.getPayType().equals("cash")) {
+                        cashAmount = orderInfo.getPayAmount();
+                    }
                     if (Objects.isNull(shopUserDuty)) {
                         shopUserDuty = new ShopUserDuty(userId, tbToken.getCreateTime(), 1, orderInfo.getOrderAmount(), loginName, "0",
                                 orderInfo.getOrderAmount(), shopId, BigDecimal.ZERO, cashAmount, BigDecimal.ZERO, "");