接口测试修改

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -32,6 +32,8 @@ public class UseIntegral implements Serializable {
     private Date stayRecordedTime;          //待入账时间
     private PageBean page=new PageBean();   //分页
 
+    private String userName;//会员姓名
+    private String userNickname;//会员昵称
     public Date getStayRecordedTime() {
         return stayRecordedTime;
     }

tooth-common-core/src/main/java/com/iamberry/wechat/tools/SendMessageUtil.java

@@ -365,7 +365,7 @@ public class SendMessageUtil {
 	 * @param url
 	 */
 	public void refundApplicationNotice(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.APPLYREFUND;
+		String temp = ResultInfo.REFUNDAPPLICATIONNOTICE;
 		temp = temp.replaceFirst("firstValueIamberry", first)
 				.replaceFirst("keyword1Value",keyword1)
 				.replaceFirst("keyword2Value",keyword2)

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -233,8 +233,10 @@ public class ResultInfo {
 	public static String SENDSUCCESS= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/**  退款申请驳回 */
-	public static String REFUNDSPPLICATIONREJECTED= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'remark':{'color':'colorValue','value':'remarkValue'}}";
+	public static String REFUNDSPPLICATIONREJECTED= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderProductPrice':{'color':'#173177','value':'keyword1Value'}, 'orderProductName':{'color':'#173177', 'value':'keyword2Value'}, 'orderName':{'color':'#173177', 'value':'keyword3Value'}, 'remark':{'color':'colorValue','value':'remarkValue'}}";
 
+	/** 退款申请通知 **/
+	public static String REFUNDAPPLICATIONNOTICE= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderProductPrice':{'color':'#173177','value':'keyword1Value'}, 'orderProductName':{'color':'#173177', 'value':'keyword2Value'}, 'orderName':{'color':'#173177', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 
 

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/loadResultUtil.java

@@ -77,7 +77,8 @@ public class loadResultUtil {
 			ResultInfo.order_apply_return = prop.getProperty("order_apply_return");			//用户 申请退货 提醒
 			ResultInfo.order_apply_barter = prop.getProperty("order_apply_barter");			//用户 申请换货 提醒
 			ResultInfo.order_send_success = prop.getProperty("order_send_success");			//发货后 提醒
-			
+			ResultInfo.refund_to_dismiss = prop.getProperty("refund_to_dismiss");			//退款申请驳回
+			ResultInfo.refund_application_notice = prop.getProperty("refund_application_notice");			//退款申请通知
 		} catch (IOException e) {
 			new RuntimeException(e.getMessage());
 		}

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -68,4 +68,10 @@ public interface UseIntegralService {
      * @return
      */
     List<StayIntegral>  listStayIntegral(StayIntegral stayIntegral);
+
+    /**
+     *  查询所有收入支出积分记录
+     * @return
+     */
+    List<UseIntegral> listUseIntegral(UseIntegral useIntegral);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -315,10 +315,10 @@ public class CartServiceImpl implements CartService {
 						Order order2 = adminOrderService.selectOrderStatusByOrderId(order.getSalesOrderid());
 						String payMoney = df.format((float)order2.getSalesYetAmount()/100) + "元";
 						//获取当前订单订单项
-						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
+						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
 						try {
-							sendMessageUtil.refundApplicationNotice("尊敬的朵粉，我们已收到您的退款申请，我们正在积极处理：",payMoney,itemList.get(0).getItemProductName(),orderId,
-									"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
+							sendMessageUtil.refundApplicationNotice("尊敬的朵粉，我们已收到您的退款申请，我们正在积极处理：",payMoney,itemList.get(0).getItemProductName(),order.getSalesOrderid(),
+									"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
 						} catch (Exception e) {
 							logger.info("订单号："+ orderId +"的订单驳回退款，发送微信消息失败!");
 						}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/UseIntegralServiceImpl.java

@@ -97,6 +97,11 @@ public class UseIntegralServiceImpl implements UseIntegralService {
     }
 
     @Override
+    public List<UseIntegral> listUseIntegral(UseIntegral useIntegral) {
+        return useIntegralMapper.listUseIntegral(useIntegral);
+    }
+
+    @Override
     @Transient
     public boolean updateIntegralStayToAlready() {
         StayIntegral stayIntegral = new StayIntegral();

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/UseIntegralMapper.java

@@ -96,6 +96,10 @@ public interface UseIntegralMapper {
      */
     List<StayIntegral>  listStayIntegral(StayIntegral stayIntegral);
 
-
+    /**
+     *  查询所有收入支出积分记录
+     * @return
+     */
+    List<UseIntegral> listUseIntegral(UseIntegral useIntegral);
 
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -204,6 +204,21 @@
         </where>
     </delete>
 
-
+    <select id="listUseIntegral" parameterType="UseIntegral" resultType="UseIntegral">
+        SELECT
+        i.*, u.user_nickname,
+        u.user_name
+        FROM
+        tb_iamberry_use_integral i
+        LEFT JOIN tb_iamberry_user_userinfo u ON i.user_openid = u.user_openid
+        WHERE
+        i.integral_type IN (1, 2)
+        <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
+            limit ${page.recordBegin},${page.pageSize}
+        </if>
+        <if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
+            limit ${page.pageSize}
+        </if>
+    </select>
 
 </mapper>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/AdminIntegrlhHandler.java

@@ -0,0 +1,59 @@
+package com.iamberry.wechat.handles.integral;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.integral.UseIntegralService;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/1/23.
+ */
+@Controller
+@RequestMapping("/admin/userIntegral")
+public class AdminIntegrlhHandler {
+
+    @Autowired
+    private UseIntegralService useIntegralService;
+    /**
+     * 待入账记录 use_type=3
+     * @param req
+     * @param pageSize
+     * @param pageNO
+     * @return
+     */
+    @RequestMapping("/listStayIntegral")
+    @ResponseBody
+    public ResultMsg listStayIntegral(HttpServletRequest req,
+                                      @RequestParam(value="useType",defaultValue= "3", required=false)Integer useType,
+                                      @RequestParam(value= "pageSize",defaultValue= "6" ,required=false)Integer pageSize,
+                                      @RequestParam(value = "pageNO", defaultValue = "1",required=false)Integer pageNO){
+        ResultMsg rm=new ResultMsg();
+        UseIntegral useIntegral=new UseIntegral();
+        useIntegral.getPage().setPageSize(pageSize);
+        useIntegral.getPage().setPageNumber(pageNO);
+        useIntegral.getPage().initRecordBegin();
+        List<UseIntegral> listStayIntegral=useIntegralService.listIntegralInfo(useIntegral);
+
+        Map<String,Object> map=new HashMap<String, Object>();
+        map.put("listStayIntegralInfo",listStayIntegral);
+
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setData(map);
+        return rm;
+    }
+}