Default Changelist

src/main/java/com/yunniu/farming/webadmin/controller/OrderMainController.java

@@ -339,7 +339,7 @@ public class OrderMainController {
     @ResponseBody
     @ResponseBody
     public Result refundReceive(@RequestBody JSONObject json){
     public Result refundReceive(@RequestBody JSONObject json){
         OrderMain user = JSONObject.toJavaObject(json,OrderMain.class);
         OrderMain user = JSONObject.toJavaObject(json,OrderMain.class);
-        return this.orderService.refundReceive(user);
+        return this.orderService.refundReceive(user, 4);
     }
     }
 
 
     /**
     /**

src/main/java/com/yunniu/farming/webadmin/service/impl/OrderMainServiceImpl.java

@@ -297,7 +297,7 @@ public class OrderMainServiceImpl {
                 .eq(OrderRefund::getOrderMianId, order.getId())
                 .eq(OrderRefund::getOrderMianId, order.getId())
                 .eq(OrderRefund::getRefundStatus, 1));
                 .eq(OrderRefund::getRefundStatus, 1));
         if (orderRefund.getRefundType().equals("1")) {
         if (orderRefund.getRefundType().equals("1")) {
-            this.refundReceive(order);
+            this.refundReceive(order, 1);
         } else {
         } else {
             orderRefund.setRefundStatus("4");
             orderRefund.setRefundStatus("4");
             refundMapper.updateById(orderRefund);
             refundMapper.updateById(orderRefund);
@@ -338,15 +338,16 @@ public class OrderMainServiceImpl {
      * 已收到退回货物，开始退款
      * 已收到退回货物，开始退款
      *
      *
      * @param order
      * @param order
+     * @param type 1仅退款， 4 退货退款
      * @return
      * @return
      */
      */
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public Result refundReceive(OrderMain order) {
+    public Result refundReceive(OrderMain order, Integer type) {
         // 根据id获取订单信息
         // 根据id获取订单信息
         OrderMain orderMain = this.orderMainDao.selectById(order.getId());
         OrderMain orderMain = this.orderMainDao.selectById(order.getId());
         OrderRefund orderRefund = refundMapper.selectOne(Wrappers.<OrderRefund>lambdaQuery()
         OrderRefund orderRefund = refundMapper.selectOne(Wrappers.<OrderRefund>lambdaQuery()
                 .eq(OrderRefund::getOrderMianId, order.getId())
                 .eq(OrderRefund::getOrderMianId, order.getId())
-                .eq(OrderRefund::getRefundStatus, 1));
+                .eq(OrderRefund::getRefundStatus, type));
         orderRefund.setRefundStatus("6");
         orderRefund.setRefundStatus("6");
         refundMapper.updateById(orderRefund);
         refundMapper.updateById(orderRefund);
         this.orderMainDao.updateById(orderMain);
         this.orderMainDao.updateById(orderMain);
@@ -576,6 +577,9 @@ public class OrderMainServiceImpl {
             List<OrderSub> orderSubs = this.orderSubDao.selectList(Wrappers.<OrderSub>lambdaQuery().eq(OrderSub::getMainid, order.getId()));
             List<OrderSub> orderSubs = this.orderSubDao.selectList(Wrappers.<OrderSub>lambdaQuery().eq(OrderSub::getMainid, order.getId()));
             for (JSONObject id : objects) {
             for (JSONObject id : objects) {
                 int num = (int) id.get("num");
                 int num = (int) id.get("num");
+                if (num == 0) {
+                    throw new RuntimeException("退款数量不可以为0");
+                }
                 OrderSub sub = orderSubs.stream().filter(orderSub -> orderSub.getId().equals(id.get("id")) ).findAny().get();
                 OrderSub sub = orderSubs.stream().filter(orderSub -> orderSub.getId().equals(id.get("id")) ).findAny().get();
                 if (ObjectUtils.isNotEmpty(sub)) {
                 if (ObjectUtils.isNotEmpty(sub)) {
                     if ((sub.getIpronum() - (sub.getSdef3() != null ? Integer.parseInt(sub.getSdef3()) : 0)) < num) {
                     if ((sub.getIpronum() - (sub.getSdef3() != null ? Integer.parseInt(sub.getSdef3()) : 0)) < num) {

src/main/resources/templates/order/refundList.html

@@ -86,7 +86,7 @@
     {{#if (d.orderRefund.refundStatus == 1 && d.orderRefund.refundType == 1) { }}
     {{#if (d.orderRefund.refundStatus == 1 && d.orderRefund.refundType == 1) { }}
     <i class="layui-icon layui-icon-ok" lay-event="pass" title="退款申请通过"></i>
     <i class="layui-icon layui-icon-ok" lay-event="pass" title="退款申请通过"></i>
     <i class="layui-icon layui-icon-close" lay-event="refuse" title="退款申请拒绝"></i>
     <i class="layui-icon layui-icon-close" lay-event="refuse" title="退款申请拒绝"></i>
-    {{# }else if(d.irefundstatus == 103){ }}
+    {{# }else if(d.orderRefund.refundStatus == 4){ }}
     <i class="layui-icon layui-icon-component" lay-event="receive" title="退款已收货"></i>
     <i class="layui-icon layui-icon-component" lay-event="receive" title="退款已收货"></i>
     {{# }else if(d.orderRefund.refundStatus == 1 && d.orderRefund.refundType == 2){ }}
     {{# }else if(d.orderRefund.refundStatus == 1 && d.orderRefund.refundType == 2){ }}
     <i class="layui-icon layui-icon-ok" lay-event="pass" title="仅退款申请通过"></i>
     <i class="layui-icon layui-icon-ok" lay-event="pass" title="仅退款申请通过"></i>