更新全选打包

src/main/java/com/chaozhanggui/system/cashierservice/interceptor/CustomFilter.java

@@ -7,11 +7,26 @@ import javax.servlet.*;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
 @Slf4j
 @Component
 @WebFilter(urlPatterns = {"/order-service/order/*"},filterName = "customFilter")
 public class CustomFilter implements Filter {
+
+    private static final List<String> unFilterUrlList= Arrays.asList("/order-service/pay/returnOrder");
+
+
+    private boolean isfilter(String url){
+        for (String s : unFilterUrlList) {
+            if(s.equals(url)){
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         log.info(">>>> customFilter init <<<<");
@@ -20,13 +35,29 @@ public class CustomFilter implements Filter {
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         log.info(">>>> customFilter doFilter start <<<<");
+//        RequestWrapper requestWapper = null;
+////        if (servletRequest instanceof HttpServletRequest) {
+////            requestWapper = new RequestWrapper((HttpServletRequest) servletRequest);
+////        }
+////        if (requestWapper != null) {
+////            filterChain.doFilter(requestWapper,servletResponse);
+////        } else {
+////            filterChain.doFilter(servletRequest,servletResponse);
+////        }
+        HttpServletRequest request=(HttpServletRequest) servletRequest;
+        if(isfilter(request.getRequestURI().toString())){
             RequestWrapper requestWapper = null;
             if (servletRequest instanceof HttpServletRequest) {
                 requestWapper = new RequestWrapper((HttpServletRequest) servletRequest);
             }
 
             if (requestWapper != null) {
+                servletResponse.setContentType("text/plain;charset=UTF-8");
                 filterChain.doFilter(requestWapper,servletResponse);
+            } else {
+                servletResponse.setContentType("text/plain;charset=UTF-8");
+                filterChain.doFilter(servletRequest,servletResponse);
+            }
         }else {
             filterChain.doFilter(servletRequest,servletResponse);
         }

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

@@ -74,7 +74,6 @@ public class PayService {
     private String backUrl;
 
 
-
     public Result queryPayType(String shopId) {
         return Result.success(CodeEnum.SUCCESS, tbShopPayTypeMapper.selectByShopId(shopId));
     }
@@ -155,15 +154,12 @@ public class PayService {
         }
 
 
-
-
         orderInfo.setPayAmount(orderInfo.getOrderAmount());
         orderInfo.setPayType(qpay);
         orderInfo.setUpdatedAt(System.currentTimeMillis());
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
 
 
-
         ScanPayReq scanPayReq = new ScanPayReq();
         scanPayReq.setAppId(thirdApply.getAppId());
         scanPayReq.setTimestamp(System.currentTimeMillis());
@@ -369,10 +365,6 @@ public class PayService {
     }
 
 
-
-
-
-
     @Transactional(rollbackFor = Exception.class)
     public Result cashPay(String orderId, String token) {
         if (ObjectUtil.isEmpty(orderId)) {
@@ -422,8 +414,6 @@ public class PayService {
     }
 
 
-
-
     @Transactional(rollbackFor = Exception.class)
     public Result bankPay(String orderId, String token) {
         if (ObjectUtil.isEmpty(orderId)) {
@@ -472,7 +462,6 @@ public class PayService {
     }
 
 
-
     @Transactional(rollbackFor = Exception.class)
     public Result returnOrder(List<TbOrderDetail> list, String token) {
         if (ObjectUtil.isEmpty(list) || list.size() <= 0) {
@@ -534,7 +523,7 @@ public class PayService {
                     continue;
                 }
                 if (map1.get(it.getId()) > it.getNum() - it.getReturnNum()) {
-                    throw new MsgException("可退数量："+ (it.getNum()-it.getReturnNum()));
+                    MsgException.checkNull(null,"可退数量：" + (it.getNum() - it.getReturnNum()));
                 }
                 if (map1.get(it.getId()) == 0) {
                     map1.put(it.getId(), it.getNum());
@@ -554,10 +543,12 @@ public class PayService {
                     detailPo.setStatus("closed");
 
                 }
+                BigDecimal returnAmount = it.getPriceAmount().divide(new BigDecimal(it.getNum()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(map1.get(it.getId())));
                 detailPo.setReturnNum(map1.get(it.getId()));
                 detailPos.add(detailPo);
                 it.setNum(map1.get(it.getId()));
                 it.setReturnNum(0);
+                it.setPriceAmount(returnAmount);
                 it.setStatus("closed");
                 it.setCreateTime(new Date());
                 it.setUpdateTime(null);
@@ -624,7 +615,6 @@ public class PayService {
         }
 
 
-
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("token", token);
         jsonObject.put("type", "return");
@@ -634,15 +624,12 @@ public class PayService {
         producer.putOrderCollect(jsonObject.toJSONString());
 
 
-
         producer.printMechine(newOrderInfo.getId() + "");
 
         return Result.success(CodeEnum.SUCCESS);
     }
 
 
-
-
     public String generateReturnOrderNumber() {
         String date = DateUtils.getSdfTimes();
         Random random = new Random();

src/main/resources/mapper/TbCashierCartMapper.xml

@@ -382,7 +382,7 @@
         select * from tb_cashier_cart where order_id=#{orderId} and `status`=#{status}
     </select>
     <select id="selectAllByMarketId" resultType="com.chaozhanggui.system.cashierservice.entity.TbCashierCart">
-        select * from tb_cashier_cart where master_id = #{maskerId} and trade_day = #{day} and shop_id = #{shopId} and status = 'create'
+        select * from tb_cashier_cart where master_id = #{masterId} and trade_day = #{day} and shop_id = #{shopId} and status = 'create'
     </select>