diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
index 0d01cd3..f190219 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
+++ b/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;
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java
index d3ca714..68800ee 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java
+++ b/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, "");
diff --git a/src/main/resources/mapper/TbOrderDetailMapper.xml b/src/main/resources/mapper/TbOrderDetailMapper.xml
index 353eea3..ddfb2d1 100644
--- a/src/main/resources/mapper/TbOrderDetailMapper.xml
+++ b/src/main/resources/mapper/TbOrderDetailMapper.xml
@@ -8,6 +8,7 @@
         <result column="product_id" jdbcType="INTEGER" property="productId"/>
         <result column="product_sku_id" jdbcType="INTEGER" property="productSkuId"/>
         <result column="num" jdbcType="INTEGER" property="num"/>
+        <result column="return_num" jdbcType="INTEGER" property="returnNum"/>
         <result column="product_name" jdbcType="VARCHAR" property="productName"/>
         <result column="product_sku_name" jdbcType="VARCHAR" property="productSkuName"/>
         <result column="product_img" jdbcType="VARCHAR" property="productImg"/>
@@ -20,7 +21,7 @@
     </resultMap>
     <sql id="Base_Column_List">
     id, order_id, shop_id, product_id, product_sku_id, num, product_name, product_sku_name, 
-    product_img, create_time, update_time, price, price_amount,status,pack_amount
+    product_img, create_time, update_time, price, price_amount,status,pack_amount,return_num
   </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         select
@@ -154,6 +155,9 @@
             <if test="num != null">
                 num = #{num,jdbcType=INTEGER},
             </if>
+            <if test="returnNum != null">
+                return_num = #{returnNum,jdbcType=INTEGER},
+            </if>
             <if test="productName != null">
                 product_name = #{productName,jdbcType=VARCHAR},
             </if>
@@ -205,13 +209,13 @@
     </update>
 
 
-  <update id="updateBatchOrderDetail" parameterType="com.chaozhanggui.system.cashierservice.entity.po.OrderDetailPo">
-    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
-      update tb_order_detail
-          set  status= #{item.status}
-      where id = #{item.id}
-    </foreach>
-  </update>
+    <update id="updateBatchOrderDetail" parameterType="com.chaozhanggui.system.cashierservice.entity.po.OrderDetailPo">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update tb_order_detail
+            set status= #{item.status}
+            where id = #{item.id}
+        </foreach>
+    </update>
 
     <select id="selectAllByOrderIdAndStatus" resultMap="BaseResultMap">
         select * from tb_order_detail where status='closed' and order_id=#{orderId} and id in
@@ -230,10 +234,10 @@
 
     <insert id="batchInsert">
         insert into tb_order_detail (order_id, shop_id,
-                                     product_id, product_sku_id, num,
-                                     product_name, product_sku_name, product_img,
-                                     create_time, update_time, price,
-                                     price_amount,pack_amount,status) values
+        product_id, product_sku_id, num,
+        product_name, product_sku_name, product_img,
+        create_time, update_time, price,
+        price_amount,pack_amount,status) values
         <foreach collection="list" separator="," item="item">
             (#{orderId},#{item.shopId},#{item.productId},#{item.productSkuId},#{item.num},#{item.productName},#{item.productSkuName},#{item.productImg},#{item.createTime},#{item.updateTime},#{item.price},#{item.priceAmount},#{item.packAmount},#{item.status})
         </foreach>