2020年11月14日 23:24:24

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html

@@ -491,7 +491,7 @@
                             btncanceltext: "取消",
                             success: function () {
                                 var dataJSON = {
-                                    "consultId": $("#id").val(),
+                                    "id": $("#id").val(),
                                     "status": "1"
                                 };
                                 $.getJSON("#springUrl('/a/consultSheet/updateStatus')", dataJSON, function (returnobj) {

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.java

@@ -19,9 +19,9 @@ import java.util.List;
 */
 public interface ConsultSheetMapper extends GenericDao<ConsultSheet> {
 
-    Integer updateDate(@Param("id") Long consultId, @Param("status") String status, @Param("description") String description);
+    Integer updateDate(@Param("id") Long id, @Param("status") Long status, @Param("description") String description);
 
-    Integer updateStatus(@Param("consultId") String consultId, @Param("status") String status);
+    Integer updateStatus(@Param("id") Long id, @Param("status") Long status);
 
     List<ConsultSheet> fetchSearchByPage(Conds conds, Sort sort, int page, int pageSize, Long id);
 

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -324,9 +324,8 @@
             <if test="status !=null">
                 status = #{status}
             </if>
-
         </set>
-        where consult_id = #{consultId}
+        where id = #{id}
     </update>
 
 

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/ConsultSheetService.java

@@ -18,9 +18,9 @@ import java.util.List;
 */
 public interface ConsultSheetService extends GenericService<ConsultSheet> {
 
-    Integer updateDate(Long id, String status, String description);
+    Integer updateDate(Long id, Long status, String description);
 
-    Integer updateStatus(String consultId, String status);
+    Integer updateStatus(Long id,Long status);
 
     List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize ,String id);
 

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java

@@ -84,15 +84,16 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
 
 
     @Override
-    public Integer updateDate(Long id, String status, String description) {
+    public Integer updateDate(Long id, Long status, String description) {
         return consultSheetMapper.updateDate(id, status, description);
     }
 
 
 
     @Override
-    public Integer updateStatus(String consultId, String status) {
-        return consultSheetMapper.updateStatus(consultId, status);
+    public Integer updateStatus(Long id, Long status) {
+        Integer integer = consultSheetMapper.updateStatus(id, status);
+        return integer;
     }
 
     @Override

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java

@@ -134,7 +134,7 @@ public class ConsultSheetController {
     //审核拒绝功能
     @RequestMapping(value = "/updateData")
     @ResponseBody
-    public JSONObject updateData(Long id, String status, String description ,HttpServletRequest request) {
+    public JSONObject updateData(Long id, Long status, String description ,HttpServletRequest request) {
         JSONObject rtnJson = new JSONObject();
        ConsultSheet consultSheet = consultSheetService.fetchById(id);
         try {
@@ -182,12 +182,12 @@ public class ConsultSheetController {
     @RequiresPermissions(value = CONSULTSHEET_EDIT)
     @RequestMapping("/updateStatus")
     @ResponseBody
-    public JSONObject updateStatus(String consultId, String status, HttpServletRequest request) {
+    public JSONObject updateStatus(Long id, Long status ,HttpServletRequest request) {
         JSONObject rtnJson = new JSONObject();
-        ConsultSheet consultSheet = consultSheetService.fetchById(Long.parseLong(consultId));
+        ConsultSheet consultSheet = consultSheetService.fetchById(id);
         try {
-            if (!StringUtils.isEmpty(consultId) && !StringUtils.isEmpty(status) ) {
-                Integer integer = consultSheetService.updateStatus(consultId, status);
+            if (!StringUtils.isEmpty(id) && !StringUtils.isEmpty(status) ) {
+                Integer integer = consultSheetService.updateStatus(id, status);
                 if (integer>0){
 
                     //生成空订单
@@ -259,7 +259,7 @@ public class ConsultSheetController {
         Conds conds = new Conds();
 
         if (!StringUtils.isEmpty(consultSheet.getUserName())){
-            conds.like("a.user_name",consultSheet.getUserName());
+            conds.like("CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8)",consultSheet.getUserName());
         }
 //        if (!StringUtils.isEmpty(consultSheet.getIllness())){
 //            conds.like("a.illness",consultSheet.getIllness());
@@ -310,10 +310,10 @@ public class ConsultSheetController {
             consultSheetVO.setUserName(consultSheet.getUserName());
             consultSheetVO.setSex(consultSheet.getSex() == 1 ? "男" : "女");
             consultSheetVO.setPhone(consultSheet.getPhone());
-            consultSheetVO.setPastRecords(consultSheet.getPastRecords().equals("0") ? "否" : "是");
-            consultSheetVO.setIllness(consultSheet.getIllness().equals("0") ? "否" : "是");
-            consultSheetVO.setAllergy(consultSheet.getAllergy().equals("0") ? "否" : "是");
-            consultSheetVO.setStatus(consultSheet.getStatus().equals("0") ? "未审核" : consultSheet.getStatus().equals("1") ? "已通过" : "已拒绝");
+            consultSheetVO.setPastRecords("0".equals(consultSheet.getPastRecords()) ? "否" : "是");
+            consultSheetVO.setIllness("0".equals(consultSheet.getIllness()) ? "否" : "是");
+            consultSheetVO.setAllergy("0".equals(consultSheet.getAllergy()) ? "否" : "是");
+            consultSheetVO.setStatus("0".equals(consultSheet.getStatus()) ? "未审核" : "1".equals(consultSheet.getStatus()) ? "已通过" : "已拒绝");
             consultSheetVO.setPharmaName(consultSheet.getPharmaName());
             consultSheetVO.setCustomerName(consultSheet.getCustomerName());
             consultSheetVOS.add(consultSheetVO);

aidea-modules/order-detail-module-web/src/main/webapp/WEB-INF/views/orderDetails/orderDetailslist.html

@@ -86,7 +86,7 @@
                                     </div>
                                     <div class="col-xs-2" >
                                         <input  type="text" class="form-control "
-                                                id="drugsCode" name="drugsCode" placeholder="商品编码">
+                                                id="productName" name="productName" placeholder="商品名称">
                                     </div>
                                 #if($shiro.hasPermission("qy:orderDetails:view"))
                                 <button type="button" class="search btn btn-primary">搜索</button>

aidea-modules/order-detail-module/src/main/java/com/cftech/orderdetail/dao/OrderDetailsMapper.xml

@@ -116,6 +116,8 @@
 
     <select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
         SELECT COUNT(1) FROM t_order_details d
+        LEFT JOIN t_order o ON o.id = d.order_id
+        LEFT JOIN t_aidea_product t ON d.drugs_id = t.id
         <include refid="sqlWhere"/>
 
     </select>

aidea-modules/order-detail-module/src/main/java/com/cftech/orderdetail/web/OrderDetailsController.java

@@ -118,10 +118,10 @@ public class OrderDetailsController {
         conds.equal("d.del_flag", Constants.DEL_FLAG_0);
         conds.equal("d.accounts_id", accountsId);
 
-        if (StringUtils.isNoneBlank(orderDetails.getDrugsCode()))
-            conds.like("d.drugs_code", orderDetails.getDrugsCode());
         if (StringUtils.isNoneBlank(orderDetails.getOrderCode()))
-            conds.like("d.order_code", orderDetails.getOrderCode());
+            conds.like("o.number", orderDetails.getOrderCode());
+        if (StringUtils.isNoneBlank(orderDetails.getProductName()))
+            conds.like("t.product_name", orderDetails.getProductName());
         if (idTmp!=null && !"".equals(idTmp)){
             conds.equal("d.order_id",idTmp);
         }

aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderform.html

@@ -492,6 +492,16 @@
                 orderAmount :orderAmount
             })
         })
+        if (!datas.productId){
+            Cfapp.alert({
+                message: "订单至少包含一件商品",
+                btntext: "确定",
+                success: function () {
+                    location.href = "#springUrl('/a/order/list')";
+                }
+            });
+            return;
+        }
 
         var url = "#springUrl('/a/order/formData')"
 

aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml

@@ -408,6 +408,7 @@
             <if test="amount != null">
                 amount = #{amount}
             </if>
+
         </set>
         where order_id =#{id} and id = #{idDetail}
     </update>

aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java

@@ -108,7 +108,11 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
                     params.put("idDetail", idDetail);
                     if(!"".equals(idDetail)){
                              orderMapper.updateDetill(params);
-                        rtnJson.put("errorNo","0");
+                        Integer integer = orderMapper.updateOrder(params);
+                        if (integer > 0) {
+                            rtnJson.put("errorNo", "0");
+                        }
+
                     }else {
                         ProductDto productDtos = orderMapper.fetchProduct(params);
                         orderDetailDto = new OrderDetailDto();

aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java

@@ -130,11 +130,11 @@ public class OrderController {
         Long accountsId = UserUtils.getmpaccounts(request);
         Conds conds = new Conds();
         conds.equal("o.del_flag", Constants.DEL_FLAG_0);
-        conds.equal("d.del_flag", Constants.DEL_FLAG_0);
+//        conds.equal("d.del_flag", Constants.DEL_FLAG_0);
         conds.equal("o.accounts_id", accountsId);
         Sort sort = new Sort("o.create_time", OrderType.DESC);
         if (!StringUtils.isEmpty(order.getNumber())) {
-            conds.like("o.order_code", order.getNumber());
+            conds.like("o.number", order.getNumber());
         }
         if (!StringUtils.isEmpty(order.getProductName())) {
             conds.like("t.product_name", order.getProductName());
@@ -184,7 +184,11 @@ public class OrderController {
             orderVO.setCourierNumber(order.getCourierNumber());
             orderVO.setTradeNo(order.getTradeNo());
             orderVO.setCreateTime(simpleDateFormat.format(order.getCreateTime()));
-            orderVO.setPayStatus(order.getPayStatus().equals("0") ? "待确认" : order.getPayStatus().equals("1") ? "待付款" : order.getPayStatus().equals("2") ? "待发货" :order.getPayStatus().equals("3") ? "待收货":order.getPayStatus().equals("4") ? "已完成" :"已取消");
+            if (("").equals(order.getPayStatus()) && order.getPayStatus()==null){
+                orderVO.setPayStatus("");
+            }else {
+                orderVO.setPayStatus(("0").equals(order.getPayStatus()) ? "待确认" : ("1").equals(order.getPayStatus()) ? "待付款" : ("2").equals(order.getPayStatus()) ? "待发货" :("3").equals(order.getPayStatus()) ? "待收货":("4").equals(order.getPayStatus()) ? "已完成" :"已取消");
+            }
             orderVOS.add(orderVO);
         }
         ExcelKit.$Export(OrderVO.class, response).toExcel(orderVOS, "订单管理信息");

aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/reportForm/reportFormlist.html

@@ -60,7 +60,7 @@
 
         <section class="content-header">
             <h1>
-                报表管理管理
+                报表管理
                 <small>报表管理</small>
             </h1>
             <ol class="breadcrumb">

behavior-modules/wx-qrcode-module/src/main/java/com/cftech/shop/qrcode/service/impl/WxQrcodeServiceImpl.java

@@ -61,9 +61,7 @@ public class WxQrcodeServiceImpl extends GenericServiceImpl<WxQrcode> implements
 
     @Override
     public int count(Long orgId, Conds conds) {
-        Map
-                <String, Object> params = new HashMap
-                <String, Object>();
+        Map<String, Object> params = new HashMap<String, Object>();
         params.put("orgId", orgId);
         params.put("conds", conds);
         return wxQrcodeMapper.count(params);

behavior-modules/wx-qrcode-module/src/main/java/com/cftech/shop/qrcode/web/WxQrcodeController.java

@@ -157,7 +157,7 @@ public class WxQrcodeController {
     }
 
     //获取用户展示数据
-    @RequestMapping(value = "/listUser",method = {RequestMethod.GET})
+    @RequestMapping(value = "/listUser")
     @ResponseBody
     public JSONObject fromUser( int userId,String name) {
         JSONObject rtnJson = new JSONObject();

cftech-common-web/src/main/resources/common-test.properties

@@ -41,7 +41,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
 #\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY
 MEMBER_PASSWORD_KEY=DONGCHANGINT9527;
 list.refreshtoken=true
-jwt.domain=pd.shxrtech.com
+jwt.domain=127.0.0.1
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 jwt.duration=86400000
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue

membercard-modules/member-module/src/main/java/com/cftech/member/model/MemberDto.java

@@ -23,7 +23,7 @@ public class MemberDto {
     @ExportConfig(value = "会员手机",width = 100)
     private String phone;
     /* 来源 */
-    @ExportConfig(value = "会员手机",width = 100)
+    @ExportConfig(value = "粉丝来源",width = 100)
     private String source;
 
     /*创建时间*/

membercard-modules/member-module/src/main/java/com/cftech/member/web/MemberController.java

@@ -175,10 +175,10 @@ public class MemberController {
 //        }
 
         if (!StringUtils.isEmpty(member.getName())) {
-            conds.like("m.name", member.getName());
+            conds.like("CONVERT(AES_DECRYPT(m.name,'aideakey') USING UTF8)", member.getName());
         }
         if (!StringUtils.isEmpty(member.getPhone())){
-            conds.like("m.phone",member.getPhone());
+            conds.like("CONVERT(AES_DECRYPT(m.phone,'aideakey') USING UTF8)",member.getPhone());
         }
 
 
@@ -260,7 +260,7 @@ public class MemberController {
         Long accountsId = UserUtils.getmpaccounts(request);
         Conds conds = new Conds();
         conds.equal("m.del_flag", Constants.DEL_FLAG_0);
-        conds.equal("m.accounts_id", accountsId);
+//        conds.equal("m.accounts_id", accountsId);
 //        if(member.getStatus().equals("1")){  //注册会员
 //            conds.isNull("m.status");
 //        }else if(member.getStatus().equals("2")){ //虚拟会员

membercard-modules/shipping-address-web/src/main/webapp/WEB-INF/views/address/addresslist.html

@@ -83,7 +83,7 @@
                                                id="addressName" name="addressName" placeholder="患者姓名">
                                     </div>
                                     <div class="col-xs-2" >
-                                        <select  id="province" name="cityId" onchange="getCityList(this.value)" class="form-control required">
+                                        <select  id="province" name="provinceId" onchange="getCityList(this.value)" class="form-control required">
                                             <option value="">请选择省份</option>
                                         </select>
                                     </div>

mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/controller/MpFanssController.java

@@ -94,7 +94,7 @@ public class MpFanssController {
             conds.equal("source", mpFanssEntity.getSource());
         }
         if (StringUtils.isNotBlank(mpFanssEntity.getNickname())) {
-            conds.like("nickname", mpFanssEntity.getNickname());
+            conds.like("CONVERT(AES_DECRYPT(nickname,'aideakey') USING UTF8)", mpFanssEntity.getNickname());
         }
         if (StringUtils.isNotBlank(startTime)) {
             conds.greatEqual("subscribetime", startTime);

mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/dao/MpFanssMapper.xml

@@ -324,7 +324,8 @@
         FROM wx_mp_fanss t
         <include refid="sqlWhere"/>
         <if test="areaname!=null">
-            AND (t.city like #{areaname} or t.province like #{areaname})
+            AND (	CONVERT ( AES_DECRYPT( t.city, 'aideakey' ) USING UTF8 ) like #{areaname}
+             or CONVERT ( AES_DECRYPT( t.province, 'aideakey' ) USING UTF8 ) like #{areaname})
         </if>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>

mp-modules/mpapi-module/src/main/java/org/mp/api/core/util/HttpRequestProxy.java

@@ -424,8 +424,12 @@ public class HttpRequestProxy {
             Entry element = (Entry) iter.next();
             params.append(element.getKey().toString());
             params.append("=");
+            if (null!=element.getValue()){
                 params.append(URLEncoder.encode(element.getValue().toString(),
                         requestEncoding));
+            }else{
+                params.append(URLEncoder.encode(""));
+            }
             params.append("&");
         }