采美豆相关显示,退款处理

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -75,6 +75,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Double paidAmount;//已付金额(用户已支付金额包括余额支付和线上线下支付)
     private Double totalDiscount;//订单退款已退的经理折扣金额
     private Integer zeroCostFlag;//订单0成本标识
+    private Integer userBeans;//采美豆抵扣运费数量(100:1)
     // -----------------  v5.0.0 end
 
     //-------------        虚拟字段   ----------------------------
@@ -953,6 +954,14 @@ public class NewOrder extends DataEntity<NewOrder> {
         this.zeroCostFlag = zeroCostFlag;
     }
 
+    public Integer getUserBeans() {
+        return userBeans;
+    }
+
+    public void setUserBeans(Integer userBeans) {
+        this.userBeans = userBeans;
+    }
+
     public String getAssociationType() {
         return associationType;
     }

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -85,6 +85,7 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private Integer zeroCostFlag;   //子订单0成本标识
     private Integer differenceType; //差价类型:1 少付;2 多付
     private BigDecimal differencePrice;  //补差价金额
+    private Integer userBeans; //订单采美豆数量
     //-------------        虚拟字段   ----------------------------
     private String shopName;            //供应商
     private String commercialCode;      //分账方,子商户商编
@@ -1083,4 +1084,12 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     public void setDifferencePrice(BigDecimal differencePrice) {
         this.differencePrice = differencePrice;
     }
+
+    public Integer getUserBeans() {
+        return userBeans;
+    }
+
+    public void setUserBeans(Integer userBeans) {
+        this.userBeans = userBeans;
+    }
 }

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -11,8 +11,11 @@ import com.caimei.modules.product.dao.CmSecondHandDetailDao;
 import com.caimei.modules.product.entity.CmPromotion;
 import com.caimei.modules.user.dao.CmUserBalanceRecordDao;
 import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.dao.CmUserbeanshistoryDao;
+import com.caimei.modules.user.dao.NewCmClubDao;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.entity.CmUserBalanceRecord;
+import com.caimei.modules.user.entity.UserBeansHistory;
 import com.caimei.modules.user.service.CmUserBalanceRecordService;
 import com.caimei.utils.AppUtils;
 import com.caimei.utils.MathUtil;
@@ -76,6 +79,10 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
     private CmUserBalanceRecordDao cmUserBalanceRecordDao;
     @Autowired
     private CmSecondHandDetailDao cmSecondHandDetailDao;
+    @Autowired
+    private NewCmClubDao newCmClubDao;
+    @Autowired
+    private CmUserbeanshistoryDao cmUserbeanshistoryDao;
 
 
     public CmReturnedPurchase get(String id) {
@@ -581,6 +588,39 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 }
                 logger.info("二手订单交易全退,OrderID>>>" + newOrder.getStatus());
             }
+
+            //采美豆退款相关
+            if ("7".equals(newOrder.getStatus())) {
+                int userBeans = user.getUserBeans();
+                //抵扣运费退回
+                UserBeansHistory beansHistory = new UserBeansHistory();
+                beansHistory.setUserId(newOrder.getUserID());
+                beansHistory.setOrderId(newOrder.getOrderID());
+                beansHistory.setAddTime(new Date());
+                if (newOrder.getUserBeans() != null && newOrder.getUserBeans() > 0) {
+                    beansHistory.setBeansType(9);
+                    beansHistory.setType(1);
+                    beansHistory.setNum(newOrder.getUserBeans());
+                    beansHistory.setPushStatus(0);
+                    newCmClubDao.insertBeansHistory(beansHistory);
+                    userBeans = userBeans + newOrder.getUserBeans();
+                    cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
+                }
+                //支付采美豆回收
+                Integer num = cmUserbeanshistoryDao.findByBeansType(newOrder.getOrderID());
+                if (num != null && num > 0) {
+                    beansHistory.setBeansType(11);
+                    beansHistory.setType(2);
+                    beansHistory.setNum(num);
+                    beansHistory.setPushStatus(0);
+                    newCmClubDao.insertBeansHistory(beansHistory);
+                    userBeans = userBeans - num;
+                    if (userBeans < 0) {
+                        userBeans = 0;
+                    }
+                    cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
+                }
+            }
         } else if (cmReturnedPurchase.getStatus().equals("3")) {//审核不通过
             cmReturnedPurchaseDao.update(cmReturnedPurchase);
             //解冻余额
@@ -772,6 +812,17 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 cmUserBalanceRecord.setDelFlag("1");
                 cmUserBalanceRecordService.updateBalanceRecordBuyReturned(cmUserBalanceRecord);
             }
+            //撤销退款采美豆
+            Integer userBeans = cmUser.getUserBeans();
+            Integer num = cmUserbeanshistoryDao.findByBeansType(newOrder.getOrderID());
+            if (num != null && num > 0) {
+                userBeans = userBeans + num;
+            }
+            if (newOrder.getUserBeans() != null && newOrder.getUserBeans() > 0) {
+                userBeans = userBeans - newOrder.getUserBeans();
+            }
+            cmUserbeanshistoryDao.updateBeansHistoryByReturned(newOrder.getOrderID());
+            cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
             //修改子订单信息
             updateShopOrderAmount(newOrder.getOrderID());
         } catch (Exception e) {

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1129,10 +1129,9 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     public void cancelOrder(Integer orderID) {
         NewOrder order = newOrderDao.findByOrderID(orderID);
         //余额退回原账户
+        CmUser user = cmUserDao.get(order.getUserID().toString());
         if (order.getBalancePayFee() > 0) {
-            CmUser user1 = cmUserDao.get(order.getUserID().toString());
-            setBalance(user1, order.getBalancePayFee(), order);
-
+            setBalance(user, order.getBalancePayFee(), order);
             //取消收支记录
             CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
             cmUserBalanceRecord.setUserId(order.getUserID());
@@ -1150,6 +1149,20 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 cmSecondHandDetailDao.updatSecondHnadBySold(orderProduct.getProductID());
             }
         }
+        //采美豆退回
+        if (order.getUserBeans() != null && order.getUserBeans() > 0) {
+            UserBeansHistory beansHistory = new UserBeansHistory();
+            beansHistory.setUserId(order.getUserID());
+            beansHistory.setOrderId(order.getOrderID());
+            beansHistory.setBeansType(9);
+            beansHistory.setType(1);
+            beansHistory.setNum(order.getUserBeans());
+            beansHistory.setPushStatus(0);
+            beansHistory.setAddTime(new Date());
+            newCmClubDao.insertBeansHistory(beansHistory);
+            int userBeans = user.getUserBeans() + order.getUserBeans();
+            cmUserDao.updateUserBeans(order.getUserID(), userBeans);
+        }
     }
 
     /**

src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -313,7 +313,13 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             //经理折扣
             so.setDiscountTotalFee(newOrder.getDiscountFee());
             //机构运费
-            so.setFreight(newOrder.getFreight());
+            if ("1".equals(newOrder.getFreePostFlag())) {
+                so.setFreight(newOrder.getFreight());
+            } else {
+                so.setFreight(Double.valueOf(newOrder.getFreePostFlag()));
+            }
+            //订单采美豆
+            so.setUserBeans(newOrder.getUserBeans());
             //机构运费是否已退
             Integer returnedFreightNum = newOrderProductDao.countReturnedFreightProduct(so.getOrderID());
             Boolean returnedFreightFlag = returnedFreightNum == null ? false : returnedFreightNum > 0 ? true : false;

src/main/java/com/caimei/modules/user/dao/CmUserDao.java

@@ -62,5 +62,14 @@ public interface CmUserDao extends CrudDao<CmUser> {
 
     void updateMoney(CmUser user);
 
-    List<CmUser> selectByMobileOrEmail(@Param("mobileOrEmail") String mobileOrEmail,@Param("source")  String source);
+    List<CmUser> selectByMobileOrEmail(@Param("mobileOrEmail") String mobileOrEmail, @Param("source") String source);
+
+    /**
+     * 修改采美豆数量
+     *
+     * @param userID
+     * @param userBeans
+     */
+    void updateUserBeans(@Param("userID") Integer userID, @Param("userBeans") int userBeans);
+
 }

src/main/java/com/caimei/modules/user/dao/CmUserbeanshistoryDao.java

@@ -10,15 +10,33 @@ import java.util.List;
 
 /**
  * 采美豆记录DAO接口
+ *
  * @author zcp
  * @version 2017-10-19
  */
 @MyBatisDao
-public interface CmUserbeanshistoryDao{
+public interface CmUserbeanshistoryDao {
 
     List<CmUser> findUserBeansList(CmUser cmuser);
 
     List<UserBeansHistory> findBeansHistoryList(UserBeansHistory userBeansHistory);
 
     Integer findOrderReceiptId(Integer orderId);
+
+    /**
+     * 查询下单送豆
+     *
+     * @param orderId
+     * @return
+     */
+    Integer findByBeansType(Integer orderId);
+
+    /**
+     * 逻辑删除退款回收
+     *
+     * @param orderId
+     */
+    void updateBeansHistoryByReturned(Integer orderId);
+
+    Integer findPurchaseReturnedId(Integer orderId);
 }

src/main/java/com/caimei/modules/user/entity/UserBeansHistory.java

@@ -56,6 +56,11 @@ public class UserBeansHistory extends DataEntity<UserBeansHistory> {
      */
     private Integer receiptId;
 
+    /**
+     * 退款id
+     */
+    private Integer returnedId;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getUserId() {
@@ -129,4 +134,12 @@ public class UserBeansHistory extends DataEntity<UserBeansHistory> {
     public void setReceiptId(Integer receiptId) {
         this.receiptId = receiptId;
     }
+
+    public Integer getReturnedId() {
+        return returnedId;
+    }
+
+    public void setReturnedId(Integer returnedId) {
+        this.returnedId = returnedId;
+    }
 }

src/main/java/com/caimei/modules/user/service/CmUserbeanshistoryService.java

@@ -39,6 +39,11 @@ public class CmUserbeanshistoryService {
                     Integer receiptId = cmUserbeanshistoryDao.findOrderReceiptId(history.getOrderId());
                     history.setReceiptId(receiptId);
                 }
+                if (9 == history.getBeansType() || 11 == history.getBeansType()) {
+                    //退款id
+                    Integer returnedId = cmUserbeanshistoryDao.findPurchaseReturnedId(history.getOrderId());
+                    history.setReturnedId(returnedId);
+                }
 
             }
         }

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -40,6 +40,7 @@
 		a.updateDate AS updateDate,
 		a.freePostFlag AS freePostFlag,
 		a.freight AS freight,
+		a.userBeans AS userBeans,
 		a.delFlag AS delFlag,
 		a.onlinePayFlag AS onlinePayFlag,
 		a.payTime AS payTime,

src/main/resources/mappings/modules/user/CmUserMapper.xml

@@ -779,4 +779,8 @@
 			AND u.registerUserTypeID IN (1,2,3,32,4)
 		</if>
 	</select>
+
+	<update id="updateUserBeans">
+		UPDATE USER SET userBeans = #{userBeans} WHERE userID = #{userID}
+	</update>
 </mapper>

src/main/resources/mappings/modules/user/CmUserbeanshistoryMapper.xml

@@ -33,6 +33,7 @@
 		  `user_beans_history`
 		WHERE
 		  userId = #{userId}
+		  AND delFlag = 0
 		<if test="type != null">
 			AND type = #{type}
 		</if>
@@ -57,5 +58,39 @@
 		  AND cdr.receiptStatus = 3
 		  AND cror.orderID = #{orderId}
 	</select>
+
+	<select id="findByBeansType" resultType="integer">
+		SELECT
+		  SUM(num)
+		FROM
+		  user_beans_history
+		WHERE
+		  orderId = #{orderId}
+		  AND beansType = 5
+	</select>
+	
+	<update id="updateBeansHistoryByReturned">
+		UPDATE
+		  user_beans_history
+		SET
+		  delFlag = 1
+		WHERE
+		  orderId = #{orderId}
+		  AND beansType IN (9, 11)
+		  AND delFlag = 0
+	</update>
+
+	<select id="findPurchaseReturnedId" resultType="integer">
+		SELECT
+		  id
+		FROM
+		  cm_returned_purchase
+		WHERE
+		  STATUS = 2
+		  AND delFlag = 0
+		  AND orderID = #{orderId}
+		LIMIT
+		  1
+	</select>
 	
 </mapper>

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -614,12 +614,12 @@
 	<insert id="insertBeansHistory">
         INSERT INTO `user_beans_history` (
           `userId`, `type`, `beansType`, `orderId`,
-          `num`, `pushStatus`, `addTime`
+          `num`, `pushStatus`, `addTime`, delFlag
         )
         VALUES
           (
             #{userId}, #{type}, #{beansType}, #{orderId},
-            #{num}, #{pushStatus}, #{addTime}
+            #{num}, #{pushStatus}, #{addTime}, 0
           )
     </insert>
 

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -354,18 +354,21 @@
             </td>
             <td>
                 运费：
-                <c:if test="${order.freight == 0}">
+                <c:if test="${order.freePostFlag == 0}">
                     包邮
                 </c:if>
-                <c:if test="${order.freight == -1}">
+                <c:if test="${order.freePostFlag == -1}">
                     到付
                 </c:if>
-                <c:if test="${order.freight == -2}">
+                <c:if test="${order.freePostFlag == -2}">
                     仪器到付-产品包邮
                 </c:if>
-                <c:if test="${order.freight != -1 && order.freight != 0 && order.freight != -2}">
+                <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                     <fmt:formatNumber value="${order.freight}" type="currency"/>
                 </c:if>
+                <c:if test="${order.userBeans > 0}">
+                    <font color="red">（采美豆抵用：${order.userBeans}）</font>
+                </c:if>
             </td>
         </tr>
         <tr>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -255,19 +255,21 @@
         </td>
         <td>
             运费：
-            <%--<fmt:formatNumber type="number" value="${order.freight}" pattern="0.00" maxFractionDigits="2" />--%>
-            <c:if test="${order.freight == 0}">
+            <c:if test="${order.freePostFlag == 0}">
                 包邮
             </c:if>
-            <c:if test="${order.freight == -1}">
+            <c:if test="${order.freePostFlag == -1}">
                 到付
             </c:if>
-            <c:if test="${order.freight == -2}">
+            <c:if test="${order.freePostFlag == -2}">
                 仪器到付-产品包邮
             </c:if>
-            <c:if test="${order.freight != -1 && order.freight != 0 && order.freight != -2}">
+            <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                 <fmt:formatNumber value="${order.freight}" type="currency"/>
             </c:if>
+            <c:if test="${order.userBeans > 0}">
+                <font color="red">（采美豆抵用：${order.userBeans}）</font>
+            </c:if>
         </td>
     </tr>
     <tr>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -365,19 +365,22 @@
                 </td>
                 <td>
                     机构运费：
-                    <c:if test="${order.freight == 0}">
+                    <c:if test="${order.freePostFlag == 0}">
                         包邮
                     </c:if>
-                    <c:if test="${order.freight == -1}">
+                    <c:if test="${order.freePostFlag == -1}">
                         到付
                     </c:if>
-                    <c:if test="${order.freight == -2}">
+                    <c:if test="${order.freePostFlag == -2}">
                         仪器到付-产品包邮
                     </c:if>
-                    <c:if test="${order.freight != -1 && order.freight != 0 && order.freight != -2}">
+                    <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                         <fmt:formatNumber value="${order.freight}" type="currency"/>
                         <c:if test="${order.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
                     </c:if>
+                    <c:if test="${order.userBeans > 0}">
+                        <font color="red">（采美豆抵用：${order.userBeans}）</font>
+                    </c:if>
                 </td>
             </tr>
             <tr>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -335,18 +335,21 @@
         </td>
         <td>
             运费：
-            <c:if test="${order.freight == 0}">
+            <c:if test="${order.freePostFlag == 0}">
                 包邮
             </c:if>
-            <c:if test="${order.freight == -1}">
+            <c:if test="${order.freePostFlag == -1}">
                 到付
             </c:if>
-            <c:if test="${order.freight == -2}">
+            <c:if test="${order.freePostFlag == -2}">
                 仪器到付-产品包邮
             </c:if>
-            <c:if test="${order.freight != -1 && order.freight != 0 && order.freight != -2}">
+            <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                 ￥<fmt:formatNumber type="number" value="${order.freight}" pattern="0.00" maxFractionDigits="2" />
             </c:if>
+            <c:if test="${order.userBeans > 0}">
+                <font color="red">（采美豆抵用：${order.userBeans}）</font>
+            </c:if>
         </td>
     </tr>
     <tr>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp

@@ -11,15 +11,6 @@
             margin-left: 0;
         }
 
-        #increase, #decrease, .lineNum {
-            width: 30px;
-            height: 30px;
-        }
-
-        .lineNum {
-            text-align: center;
-        }
-
         .dateInput input {
             width: 150px;
         }
@@ -187,18 +178,21 @@
         </td>
         <td>
             运费：
-            <c:if test="${order.freight == 0}">
+            <c:if test="${order.freePostFlag == 0}">
                 包邮
             </c:if>
-            <c:if test="${order.freight == -1}">
+            <c:if test="${order.freePostFlag == -1}">
                 到付
             </c:if>
-            <c:if test="${order.freight == -2}">
+            <c:if test="${order.freePostFlag == -2}">
                 仪器到付-产品包邮
             </c:if>
-            <c:if test="${order.freight != -1 && order.freight != 0 && order.freight != -2}">
+            <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                 ¥<fmt:formatNumber value="${order.freight}" pattern="0.00"/>
             </c:if>
+            <c:if test="${order.userBeans > 0}">
+                <font color="red">（采美豆抵用：${order.userBeans}）</font>
+            </c:if>
         </td>
     </tr>
     <tr>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

@@ -474,6 +474,9 @@
                             <fmt:formatNumber value="${s.freight}" type="currency"/>
                             <c:if test="${s.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
                         </c:if>
+                        <c:if test="${s.userBeans > 0}">
+                            <br><font color="red">（采美豆抵用：${s.userBeans}）</font>
+                        </c:if>
                     </td>
                     <td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number"
                                                           pattern="#,##0.00"/></td>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -4,7 +4,6 @@
 <head>
     <title>订单列表</title>
     <meta name="decorator" content="default"/>
-    <%--<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>--%>
     <style type="text/css">
         *{margin:0;padding:0}
         a{list-style:none;text-decoration:none}
@@ -272,6 +271,9 @@
             <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                 <fmt:formatNumber value="${order.freight}" type="currency"/>
             </c:if>
+            <c:if test="${order.userBeans > 0}">
+                <font color="red">（采美豆抵用：${order.userBeans}）</font>
+            </c:if>
         </td>
         <td style="position: relative;"><a class="operation-btn btn">功能</a>
             <div class="operation-block">

src/main/webapp/WEB-INF/views/modules/user/cmUserbeanshistoryList.jsp

@@ -95,13 +95,18 @@
 						系统发放
 					</c:if>
 					<c:if test="${userBeansHistory.beansType eq 9}">
-						抵用退回
+						<c:if test="${not empty userBeansHistory.returnedId}">
+							<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord?id=${userBeansHistory.returnedId}&orderID=${userBeansHistory.orderId}">抵用退回</a>
+						</c:if>
+						<c:if test="${empty userBeansHistory.returnedId}">
+							<a href="${ctx}/hehe/new/order/detail?id=${userBeansHistory.returnedId}">确认收货</a>
+						</c:if>
 					</c:if>
 					<c:if test="${userBeansHistory.beansType eq 10}">
 						抵用运费
 					</c:if>
 					<c:if test="${userBeansHistory.beansType eq 11}">
-						退款回收
+						<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord?id=${userBeansHistory.returnedId}&orderID=${userBeansHistory.orderId}">退款回收</a>
 					</c:if>
 				</td>
 			</tr>