Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -1,10 +1,7 @@
 package com.iamberry.rst.controllers.order;
 
 import com.alibaba.fastjson.JSONObject;
-import com.iamberry.rst.core.cm.SalesOrder;
-import com.iamberry.rst.core.cm.SalesOrderItem;
-import com.iamberry.rst.core.cm.StoreInfo;
-import com.iamberry.rst.core.cm.StoreShip;
+import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.order.EOrderRequestData;
 import com.iamberry.rst.core.order.PostInfo;
 import com.iamberry.rst.core.order.PostOrderNum;
@@ -12,10 +9,7 @@ import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsBatch;
 import com.iamberry.rst.core.tools.LogisticsInfo;
-import com.iamberry.rst.faces.cm.PostOrderNumService;
-import com.iamberry.rst.faces.cm.SalesOrderService;
-import com.iamberry.rst.faces.cm.StoreInfoService;
-import com.iamberry.rst.faces.cm.StoreShipService;
+import com.iamberry.rst.faces.cm.*;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.utils.OrderUtils;
@@ -62,6 +56,8 @@ public class AwaitSendController {
     private PostOrderNumService postOrderNumService;
     @Autowired
     private StoreInfoService storeInfoService;
+    @Autowired
+    private CustomerService customerService;
 
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AwaitSendController.class);
@@ -210,7 +206,6 @@ public class AwaitSendController {
         SalesOrder salesOrderInfo = salesOrderService.getSalesOrderById(salesId);
         // 替换
         post = salesOrderInfo.getSalesPostFirm();
-
         StoreShip storeShip = null;
         if(salesOrderInfo.getSalesStoreId() != null){
             storeShip = storeShipService.getStoreShipByStoreId(salesOrderInfo.getSalesStoreId());
@@ -230,7 +225,6 @@ public class AwaitSendController {
         eOrderRequestData.Cost = (0.00);
         eOrderRequestData.OtherCost = (0.0);
         eOrderRequestData.Remark = salesId + "-" + orderId;
-
         // 不同的快递公司需要做不同的处理
         if (post.equalsIgnoreCase("EMS")) {
             // 省内EMS
@@ -255,15 +249,12 @@ public class AwaitSendController {
             eOrderRequestData.CustomerName = ("651476854");
             eOrderRequestData.ExpType = ("2");
         }
-
         LOGGER.info( "===salesId:" + salesId + "快递方式：" + post+ "订单编号:"+ orderId);
-
         // 收件人信息
         String[] addrs = salesOrderInfo.getSalesAddressInfo().split("-");
         if (addrs.length <= 3) {
             addrs = salesOrderInfo.getSalesAddressInfo().split(" ");
         }
-
         // 获取收件人邮编
         String postCode = AddrUtil.getPostCode(addrs[2]);
         if (postCode == null || "".equals(postCode)) {
@@ -300,9 +291,17 @@ public class AwaitSendController {
         // 整个产品的重量
         Double colorIsWeight = 0.00;
         StringBuilder goodName = new StringBuilder();
+        // 2018-12-21 增加打印面单需求：判断是否为维修机
+        if (salesOrderInfo.getSalesCustomerId() != null) {
+            CustomerInfo customerInfo = customerService.getCustomerInfo(salesOrderInfo.getSalesCustomerId());
+            if (customerInfo != null && customerInfo.getCustomerIsSolve() != null && customerInfo.getCustomerIsSolve() == 4) {
+                goodName.append("【原机返回】");
+            }
+        }
         int Goodsquantity = 0;
         for (SalesOrderItem temp : items) {
-            goodName.append(temp.getProductAbbreviation()).append("(").append(temp.getColorAbbreviation()).append(")*").append(temp.getItemNum()).append(";");
+            goodName.append(temp.getProductAbbreviation())
+                    .append("(").append(temp.getColorAbbreviation()).append(")*").append(temp.getItemNum()).append(";");
             if(temp.getColorIsWeight() != null){
                 colorIsWeight += temp.getColorIsWeight();
             }
@@ -311,15 +310,13 @@ public class AwaitSendController {
         // 20181113增加需求：产品名称后面增加打印订单日期
         goodName.append("【D").append(DateTimeUtil.format(new Date(), "MMdd")).append("】");
         String uuid = UUIDGenerator.getUUID().substring(0, 8);
-
+        // 增加产品信息
         Map<String, Object> product1 = new HashMap<String, Object>();
         product1.put("GoodsName", uuid);
         product1.put("Goodsquantity", Goodsquantity);
         // 计算产品重量deliver_statistics
         product1.put("GoodsWeight", colorIsWeight/1000);
-
         commodity.add(product1);
-
         eOrderRequestData.Commodity = (commodity);
         eOrderRequestData.Weight = (colorIsWeight/1000);
         eOrderRequestData.Quantity = (1);

watero-rst-web/src/main/java/com/iamberry/rst/utils/KuaiDi100.java

@@ -347,15 +347,12 @@ public class KuaiDi100 {
      * @return
      */
     public String selectCourierCompany(String code) {
-       String errorPath = "D:\\testJavaPath\\error.txt";
-       String successPath = "D:\\testJavaPath\\success.txt";
-
         String courierCompang="";
-        Map<String,Object> requestMap = new HashMap();
-        requestMap.put("LogisticCode",code);
+//        Map<String,Object> requestMap = new HashMap();
+//        requestMap.put("LogisticCode",code);
         try {
             Map<String, String> params = new HashMap<String, String>();
-            params.put("nu", "221435993148");
+            params.put("nu", code);
             String url = "http://api.open.baidu.com/pae/common/api/Redirect";
             // 发送请求
             String html = HttpClient431Util.doGet(params, url);
@@ -364,19 +361,13 @@ public class KuaiDi100 {
             String value = content.val();
             if(value == null || "".equals(value)){
                 LOGGER.info("=========快递单号:"+code+";查询不到快递公司");
-                String errorMsg = "快递单号:" + code+";查询不到快递公司+"+"\n";
-                writeTxt(errorPath,errorMsg);
             }else{
                 value = kuaidiToRstCode(value); //转换物流方式
                 LOGGER.info("=========快递单号:"+code+";查询成功，快递公司:"+code+":"+value);
-                String errorMsg = "快递单号:" + code+"快递公司:"+code+":"+value +"\n";
-                writeTxt(successPath,errorMsg);
             }
         } catch (Exception e) {
             e.printStackTrace();
             LOGGER.info("=========快递单号:"+code+";处理报错");
-            String errorMsg = "快递单号:" + code+";处理报错+"+"\n";
-            writeTxt(errorPath,errorMsg);
         }
         return courierCompang;
     }

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -115,7 +115,7 @@
             <tr class="text-c">
                 <th width="16"><input type="checkbox" ></th>
                 <th width="50">订单类型</th>
-                <th width="60">订单号</th>
+                <th width="60">交易号</th>
                 <th width="72">批次号</th>
                 <th width="72">下单管理员</th>
                 <th width="75">姓名/电话</th>
@@ -173,7 +173,7 @@
                             正常
                         </#if>
                     </td>
-                    <td>${order.salesOrderId!''}</td>
+                    <td>${order.salesDealCode!''}</td>
                     <td>${order.salesBatchId!''}</td>
                     <td>${order.salesAdminName!''}</td>
                     <td>${order.salesAddressName!''}${order.salesAddressTel!''}</td>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/thanksgiving/ThanksGivingServiceImpl.java

@@ -10,6 +10,7 @@ import com.iamberry.wechat.service.mapper.ThanksGivingMapper;
 import com.iamberry.wechat.tools.StrUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -62,11 +63,12 @@ public class ThanksGivingServiceImpl  implements ThanksGivingService {
      * @return Integer
      */
     @Override
+    @Transactional
     public  Integer  update(ThanksGiving  thanksGiving){
 
         CouponType couponType = couponTypeMapper.getCouponTypeById(1000);
         Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DATE, 90);    //增加一天
+        calendar.add(Calendar.DATE, 90);  //有效期三个月
 
         //创建优惠券
         CouponItem couponItem = new CouponItem();
@@ -78,12 +80,17 @@ public class ThanksGivingServiceImpl  implements ThanksGivingService {
         couponItem.setCouponUseStatus(1);
         couponItem.setCouponItemRemark(couponType.getCouponRemark());
         Integer flag = couponItemMapper.insertCouponItem(couponItem);
+        if(flag < 1){
+            throw new RuntimeException("创建优惠券失败");
+        }
 
-
+        thanksGiving.setCouponItemId(uuidStr);
         thanksGiving.setThanksGivingStatus(2);
         thanksGiving.setThanksGivingTime(new Date());
         flag = thanksGivingMapper.update(thanksGiving);
-
+        if(flag < 1){
+            throw new RuntimeException("修改领取状态失败");
+        }
         return  flag;
     }
 

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/thanksgiving/ThanksGivingHandler.java

@@ -7,8 +7,6 @@ import com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.order.CodeService;
 import com.iamberry.wechat.face.thanksgiving.ThanksGivingService;
-import com.iamberry.wechat.service.ImberryConfig;
-import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.payUtil.RandomUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -46,6 +44,28 @@ public class ThanksGivingHandler {
      * @return
      */
     @ResponseBody
+    @RequestMapping("/attention_veri")
+    public ResultMsg attentionVeri(HttpServletRequest requeste){
+        ResultMsg rm = new ResultMsg();
+        Member member =  WechatUtils.getUserBySession(requeste);
+
+        member = memberService.getMemberByUserOpenId(member.getUserOpenid());
+        if(member.getUserStatus() != 2){
+            return new ResultMsg(false, ResultMsg.ERROR, "未关注不能领取!",null);
+        }
+        rm.setMessage(ResultMsg.SUCCESS);
+        rm.setStatus(true);
+        return rm;
+    }
+
+
+    /**
+     * 发送验证码
+     * 2016年4月21日
+     * @author 穆再兴
+     * @return
+     */
+    @ResponseBody
     @RequestMapping("/send_veri")
     public ResultMsg sendPhone(HttpServletRequest request,String phone){
         ResultMsg rm = new ResultMsg();
@@ -58,9 +78,9 @@ public class ThanksGivingHandler {
         }
 //
         member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-//        if(member.get){
-//
-//        }
+        if(member.getUserStatus() != 2){
+            return new ResultMsg(false, ResultMsg.ERROR, "未关注不能领取!",null);
+        }
 
         ThanksGiving thanksGiving = new ThanksGiving();
         thanksGiving.setThanksGivingPhone(phone);
@@ -97,6 +117,10 @@ public class ThanksGivingHandler {
     public ResultMsg receiveCoupon(HttpServletRequest request,String phone,String code){
         ResultMsg rm = new ResultMsg();
         Member member =  WechatUtils.getUserBySession(request);
+        member = memberService.getMemberByUserOpenId(member.getUserOpenid());
+        if(member.getUserStatus() != 2){
+            return new ResultMsg(false, ResultMsg.ERROR, "未关注不能领取!",null);
+        }
 
         if(phone.length() != 11){
             rm.setMessage(ResultMsg.ERROR);
@@ -135,8 +159,13 @@ public class ThanksGivingHandler {
         tg.setThanksGivingPhone(phone);
         tg.setThanksGivingId(thanksGivingList.get(0).getThanksGivingId());
         tg.setThanksGivingOpenId(member.getUserOpenid());
-
-        Integer flag = thanksGivingService.update(tg);
+        Integer flag = 0;
+        try{
+             thanksGivingService.update(tg);
+        }catch (Exception e){
+            e.printStackTrace();
+            return new ResultMsg(false, ResultMsg.ERROR, e.getMessage(),null);
+        }
         if(flag < 1){
             return new ResultMsg(false, ResultMsg.ERROR, "领取失败，请重新领取!",null);
         }